diff --git a/example/ExampleMain.cpp b/example/ExampleMain.cpp
index dca3b5e..646532d 100644
--- a/example/ExampleMain.cpp
+++ b/example/ExampleMain.cpp
@@ -105,7 +105,7 @@ void createFunctionExample(Module &module, const Twine &name) {
 
   y6->setIndex(b.getInt32(1));
 
-  Value *p1 = b.create<xd::cpp::ReadOp>(b.getPtrTy(0));
+  Value *p1 = b.create<xd::cpp::ReadOp>(b.getPtrTy());
   p1->setName("p1");
   Value *p2 = b.create<xd::cpp::StreamAddOp>(p1, b.getInt64(14), b.getInt8(0));
   p2->setName("p2");
diff --git a/include/llvm-dialects/Dialect/Dialect.td b/include/llvm-dialects/Dialect/Dialect.td
index 45ba0e4..9acae9d 100644
--- a/include/llvm-dialects/Dialect/Dialect.td
+++ b/include/llvm-dialects/Dialect/Dialect.td
@@ -175,7 +175,7 @@ def I64 : TgConstant<(IntegerType 64)>, Type;
 def PointerType : BuiltinType {
   let arguments = (args type:$self, AttrI32:$address_space);
   // Supports both typed and opaque pointers.
-  let evaluate = "::llvm::PointerType::get(::llvm::Type::getInt8Ty($_context), $address_space)";
+  let evaluate = "::llvm::PointerType::get($_context, $address_space)";
   let check = "$self->isPointerTy()";
   let capture = ["$self->getPointerAddressSpace()"];
 }
diff --git a/test/example/generated/ExampleDialect.cpp.inc b/test/example/generated/ExampleDialect.cpp.inc
index abd6fea..a7949fc 100644
--- a/test/example/generated/ExampleDialect.cpp.inc
+++ b/test/example/generated/ExampleDialect.cpp.inc
@@ -564,17 +564,17 @@ rhs
 ::llvm::Type * const retType = getRet()->getType();
 (void)retType;
 
-        if (::llvm::PointerType::get(::llvm::Type::getInt8Ty(context), 0) != lhsType) {
+        if (::llvm::PointerType::get(context, 0) != lhsType) {
           errs << "  unexpected value of $lhs:\n";
-          errs << "    expected:  " << printable(::llvm::PointerType::get(::llvm::Type::getInt8Ty(context), 0)) << '\n';
+          errs << "    expected:  " << printable(::llvm::PointerType::get(context, 0)) << '\n';
           errs << "    actual:    " << printable(lhsType) << '\n';
         
           return false;
         }
       
-        if (::llvm::PointerType::get(::llvm::Type::getInt8Ty(context), 0) != rhsType) {
+        if (::llvm::PointerType::get(context, 0) != rhsType) {
           errs << "  unexpected value of $rhs:\n";
-          errs << "    expected:  " << printable(::llvm::PointerType::get(::llvm::Type::getInt8Ty(context), 0)) << '\n';
+          errs << "    expected:  " << printable(::llvm::PointerType::get(context, 0)) << '\n';
           errs << "    actual:    " << printable(rhsType) << '\n';
         
           return false;
@@ -2077,9 +2077,9 @@ initial
 ::llvm::Type * const resultType = getResult()->getType();
 (void)resultType;
 
-        if (::llvm::PointerType::get(::llvm::Type::getInt8Ty(context), 0) != ptrType) {
+        if (::llvm::PointerType::get(context, 0) != ptrType) {
           errs << "  unexpected value of $ptr:\n";
-          errs << "    expected:  " << printable(::llvm::PointerType::get(::llvm::Type::getInt8Ty(context), 0)) << '\n';
+          errs << "    expected:  " << printable(::llvm::PointerType::get(context, 0)) << '\n';
           errs << "    actual:    " << printable(ptrType) << '\n';
         
           return false;
@@ -2169,9 +2169,9 @@ initial
 ::llvm::Type * const resultType = getResult()->getType();
 (void)resultType;
 
-        if (::llvm::PointerType::get(::llvm::Type::getInt8Ty(context), 0) != ptrType) {
+        if (::llvm::PointerType::get(context, 0) != ptrType) {
           errs << "  unexpected value of $ptr:\n";
-          errs << "    expected:  " << printable(::llvm::PointerType::get(::llvm::Type::getInt8Ty(context), 0)) << '\n';
+          errs << "    expected:  " << printable(::llvm::PointerType::get(context, 0)) << '\n';
           errs << "    actual:    " << printable(ptrType) << '\n';
         
           return false;
@@ -2261,9 +2261,9 @@ initial
 ::llvm::Type * const resultType = getResult()->getType();
 (void)resultType;
 
-        if (::llvm::PointerType::get(::llvm::Type::getInt8Ty(context), 0) != ptrType) {
+        if (::llvm::PointerType::get(context, 0) != ptrType) {
           errs << "  unexpected value of $ptr:\n";
-          errs << "    expected:  " << printable(::llvm::PointerType::get(::llvm::Type::getInt8Ty(context), 0)) << '\n';
+          errs << "    expected:  " << printable(::llvm::PointerType::get(context, 0)) << '\n';
           errs << "    actual:    " << printable(ptrType) << '\n';
         
           return false;
@@ -2303,7 +2303,7 @@ initial
       const ::llvm::AttributeList attrs
           = ExampleDialect::get(context).getAttributeList(6);
     auto fnType = ::llvm::FunctionType::get(::llvm::Type::getVoidTy(context), {
-::llvm::PointerType::get(::llvm::Type::getInt8Ty(context), 0),
+::llvm::PointerType::get(context, 0),
 }, false);
 
     auto fn = module.getOrInsertFunction(s_name, fnType, attrs);
@@ -2343,10 +2343,10 @@ initial
         return false;
       }
   
-        if (getArgOperand(0)->getType() != ::llvm::PointerType::get(::llvm::Type::getInt8Ty(context), 0)) {
+        if (getArgOperand(0)->getType() != ::llvm::PointerType::get(context, 0)) {
           errs << "  argument 0 (val) has type: "
                  << *getArgOperand(0)->getType() << '\n';
-          errs << "  expected: " << *::llvm::PointerType::get(::llvm::Type::getInt8Ty(context), 0) << '\n';
+          errs << "  expected: " << *::llvm::PointerType::get(context, 0) << '\n';
           return false;
         }
       ::llvm::StringRef const val = getVal();