Index: src/Concurrency/Corun.cpp
===================================================================
--- src/Concurrency/Corun.cpp	(revision ca9d65e54b7ed187b75dfe016b8d4e2debd19fa4)
+++ src/Concurrency/Corun.cpp	(revision cf191acabcbe38d3f82a9149c4febffefea40a9a)
@@ -130,5 +130,5 @@
                 new ObjectDecl( loc,
                     numProcsName,
-                    new BasicType( BasicType::Kind::UnsignedInt ),
+                    new BasicType( BasicKind::UnsignedInt ),
                     new SingleInit( loc, 
                         new UntypedExpr( loc,
@@ -146,5 +146,5 @@
                 new ObjectDecl( loc,
                     currProcsName,
-                    new BasicType( BasicType::Kind::UnsignedInt ),
+                    new BasicType( BasicKind::UnsignedInt ),
                     new SingleInit( loc, ConstantExpr::from_int( loc, 0 ) )
                 )
Index: src/Concurrency/Waitfor.cpp
===================================================================
--- src/Concurrency/Waitfor.cpp	(revision ca9d65e54b7ed187b75dfe016b8d4e2debd19fa4)
+++ src/Concurrency/Waitfor.cpp	(revision cf191acabcbe38d3f82a9149c4febffefea40a9a)
@@ -244,5 +244,5 @@
 	ast::ObjectDecl * flag = new ast::ObjectDecl( location,
 		namer_flg.newName(),
-		new ast::BasicType( ast::BasicType::Bool ),
+		new ast::BasicType( ast::BasicKind::Bool ),
 		new ast::SingleInit( location,
 			ast::ConstantExpr::from_ulong( location, 0 )
@@ -349,5 +349,5 @@
 	ast::ObjectDecl * timeout = new ast::ObjectDecl( topLocation,
 		namer_tim.newName(),
-		new ast::BasicType( ast::BasicType::LongLongUnsignedInt ),
+		new ast::BasicType( ast::BasicKind::LongLongUnsignedInt ),
 		new ast::SingleInit( topLocation,
 			ast::ConstantExpr::from_int( topLocation, -1 )
@@ -397,5 +397,5 @@
 	ast::ObjectDecl * index = new ast::ObjectDecl( location,
 		namer_idx.newName(),
-		new ast::BasicType( ast::BasicType::ShortSignedInt ),
+		new ast::BasicType( ast::BasicKind::ShortSignedInt ),
 		new ast::SingleInit( location,
 			ast::ConstantExpr::from_int( location, -1 )
Index: src/Concurrency/Waituntil.cpp
===================================================================
--- src/Concurrency/Waituntil.cpp	(revision ca9d65e54b7ed187b75dfe016b8d4e2debd19fa4)
+++ src/Concurrency/Waituntil.cpp	(revision cf191acabcbe38d3f82a9149c4febffefea40a9a)
@@ -498,6 +498,6 @@
             rightExpr = genPredExpr( loc, currNode->right, idx, genLeaf );
             return new LogicalExpr( loc, 
-                new CastExpr( loc, leftExpr, new BasicType( BasicType::Kind::Bool ), GeneratedFlag::ExplicitCast ),
-                new CastExpr( loc, rightExpr, new BasicType( BasicType::Kind::Bool ), GeneratedFlag::ExplicitCast ), 
+                new CastExpr( loc, leftExpr, new BasicType( BasicKind::Bool ), GeneratedFlag::ExplicitCast ),
+                new CastExpr( loc, rightExpr, new BasicType( BasicKind::Bool ), GeneratedFlag::ExplicitCast ), 
                 LogicalFlag::AndExpr 
             );
@@ -507,6 +507,6 @@
             rightExpr = genPredExpr( loc, currNode->right, idx, genLeaf );
             return new LogicalExpr( loc,
-                new CastExpr( loc, leftExpr, new BasicType( BasicType::Kind::Bool ), GeneratedFlag::ExplicitCast ),
-                new CastExpr( loc, rightExpr, new BasicType( BasicType::Kind::Bool ), GeneratedFlag::ExplicitCast ), 
+                new CastExpr( loc, leftExpr, new BasicType( BasicKind::Bool ), GeneratedFlag::ExplicitCast ),
+                new CastExpr( loc, rightExpr, new BasicType( BasicKind::Bool ), GeneratedFlag::ExplicitCast ), 
                 LogicalFlag::OrExpr );
             break;
@@ -556,5 +556,5 @@
             new ObjectDecl( loc,
                 "clause_statuses",
-                new PointerType( new BasicType( BasicType::Kind::LongUnsignedInt ) )
+                new PointerType( new BasicType( BasicKind::LongUnsignedInt ) )
             )
         },
@@ -562,5 +562,5 @@
             new ObjectDecl( loc,
                 "sat_ret",
-                new BasicType( BasicType::Kind::Bool )
+                new BasicType( BasicKind::Bool )
             )
         },
@@ -766,5 +766,5 @@
                 new ObjectDecl( loc,
                     idxName,
-                    new BasicType( BasicType::Kind::SignedInt ),
+                    new BasicType( BasicKind::SignedInt ),
                     new SingleInit( loc, ConstantExpr::from_int( loc, 0 ) )
                 )
@@ -893,5 +893,5 @@
                     new ObjectDecl( cLoc,
                         currClause->whenName,
-                        new BasicType( BasicType::Kind::Bool ),
+                        new BasicType( BasicKind::Bool ),
                         new SingleInit( cLoc, ast::deepCopy( stmt->clauses.at(i)->when_cond ) )
                     )
@@ -915,5 +915,5 @@
                 new ObjectDecl( stmt->else_cond->location,
                     elseWhenName,
-                    new BasicType( BasicType::Kind::Bool ),
+                    new BasicType( BasicKind::Bool ),
                     new SingleInit( stmt->else_cond->location, ast::deepCopy( stmt->else_cond ) )
                 )
@@ -945,5 +945,5 @@
                     new CastExpr( cLoc, 
                         new AddressExpr( cLoc, new NameExpr( cLoc, data.at(i)->nodeName ) ),
-                        new BasicType( BasicType::Kind::LongUnsignedInt ), GeneratedFlag::ExplicitCast 
+                        new BasicType( BasicKind::LongUnsignedInt ), GeneratedFlag::ExplicitCast 
                     )
                 }
@@ -986,9 +986,9 @@
                     new CastExpr( cLoc,
                         new NameExpr( cLoc, elseWhenName ),
-                        new BasicType( BasicType::Kind::Bool ), GeneratedFlag::ExplicitCast 
+                        new BasicType( BasicKind::Bool ), GeneratedFlag::ExplicitCast 
                     ),
                     new CastExpr( cLoc,
                         raceFnCall,
-                        new BasicType( BasicType::Kind::Bool ), GeneratedFlag::ExplicitCast 
+                        new BasicType( BasicKind::Bool ), GeneratedFlag::ExplicitCast 
                     ),
                     LogicalFlag::AndExpr
@@ -1016,9 +1016,9 @@
             new CastExpr( cLoc,
                 new NameExpr( cLoc, data.at(idx)->whenName ), 
-                new BasicType( BasicType::Kind::Bool ), GeneratedFlag::ExplicitCast 
+                new BasicType( BasicKind::Bool ), GeneratedFlag::ExplicitCast 
             ),
             new CastExpr( cLoc,
                 baseCond,
-                new BasicType( BasicType::Kind::Bool ), GeneratedFlag::ExplicitCast 
+                new BasicType( BasicKind::Bool ), GeneratedFlag::ExplicitCast 
             ),
             LogicalFlag::AndExpr
@@ -1034,5 +1034,5 @@
                         new NameExpr( cLoc, data.at(idx)->nodeName ),
                         new AddressExpr( cLoc, new NameExpr( cLoc, data.at(idx)->statusName ) ),
-                        ConstantExpr::null( cLoc, new PointerType( new BasicType( BasicType::Kind::SignedInt ) ) )
+                        ConstantExpr::null( cLoc, new PointerType( new BasicType( BasicKind::SignedInt ) ) )
                     }
                 )
@@ -1096,5 +1096,5 @@
         new ObjectDecl( loc,
             statusName,
-            new BasicType( BasicType::Kind::LongUnsignedInt ),
+            new BasicType( BasicKind::LongUnsignedInt ),
             new SingleInit( loc, ConstantExpr::from_int( loc, 0 ) )
         )
@@ -1114,5 +1114,5 @@
             new NameExpr( cLoc, "?!=?" ), 
             {
-                ConstantExpr::null( cLoc, new PointerType( new BasicType( BasicType::Kind::LongUnsignedInt ) ) ),
+                ConstantExpr::null( cLoc, new PointerType( new BasicType( BasicKind::LongUnsignedInt ) ) ),
                 new UntypedExpr( cLoc, 
                     new NameExpr( cLoc, "__get_clause_status" ), 
@@ -1128,9 +1128,9 @@
                 new CastExpr( cLoc,
                     new NameExpr( cLoc, clauseData.at(i)->whenName ), 
-                    new BasicType( BasicType::Kind::Bool ), GeneratedFlag::ExplicitCast 
+                    new BasicType( BasicKind::Bool ), GeneratedFlag::ExplicitCast 
                 ),
                 new CastExpr( cLoc,
                     statusPtrCheck,
-                    new BasicType( BasicType::Kind::Bool ), GeneratedFlag::ExplicitCast 
+                    new BasicType( BasicKind::Bool ), GeneratedFlag::ExplicitCast 
                 ),
                 LogicalFlag::AndExpr
@@ -1162,9 +1162,9 @@
                 new CastExpr( loc,
                     new NameExpr( loc, clauseData.at( whenIndices.at(i) )->whenName ), 
-                    new BasicType( BasicType::Kind::Bool ), GeneratedFlag::ExplicitCast 
+                    new BasicType( BasicKind::Bool ), GeneratedFlag::ExplicitCast 
                 ),
                 new CastExpr( loc,
                     lastExpr,
-                    new BasicType( BasicType::Kind::Bool ), GeneratedFlag::ExplicitCast 
+                    new BasicType( BasicKind::Bool ), GeneratedFlag::ExplicitCast 
                 ),
                 LogicalFlag::OrExpr
@@ -1220,5 +1220,5 @@
         new ObjectDecl( loc,
             pCountName,
-            new BasicType( BasicType::Kind::SignedInt ),
+            new BasicType( BasicKind::SignedInt ),
             new SingleInit( loc, ConstantExpr::from_int( loc, 0 ) )
         )
@@ -1229,5 +1229,5 @@
         new ObjectDecl( loc,
             statusArrName,
-            new ArrayType( new BasicType( BasicType::Kind::LongUnsignedInt ), ConstantExpr::from_int( loc, numClauses ), LengthFlag::FixedLen, DimensionFlag::DynamicDim ),
+            new ArrayType( new BasicType( BasicKind::LongUnsignedInt ), ConstantExpr::from_int( loc, numClauses ), LengthFlag::FixedLen, DimensionFlag::DynamicDim ),
             new ListInit( loc,
                 {
@@ -1331,9 +1331,9 @@
             new CastExpr( cLoc,
                 statusExpr, 
-                new BasicType( BasicType::Kind::Bool ), GeneratedFlag::ExplicitCast 
+                new BasicType( BasicKind::Bool ), GeneratedFlag::ExplicitCast 
             ),
             new CastExpr( cLoc,
                 genSelectTraitCall( stmt->clauses.at(i), clauseData.at(i), "unregister_select" ),
-                new BasicType( BasicType::Kind::Bool ), GeneratedFlag::ExplicitCast 
+                new BasicType( BasicKind::Bool ), GeneratedFlag::ExplicitCast 
             ),
             LogicalFlag::AndExpr
@@ -1346,9 +1346,9 @@
                 new CastExpr( cLoc,
                     new NameExpr( cLoc, clauseData.at(i)->whenName ), 
-                    new BasicType( BasicType::Kind::Bool ), GeneratedFlag::ExplicitCast 
+                    new BasicType( BasicKind::Bool ), GeneratedFlag::ExplicitCast 
                 ),
                 new CastExpr( cLoc,
                     statusExpr,
-                    new BasicType( BasicType::Kind::Bool ), GeneratedFlag::ExplicitCast 
+                    new BasicType( BasicKind::Bool ), GeneratedFlag::ExplicitCast 
                 ),
                 LogicalFlag::AndExpr