Index: src/ResolvExpr/CommonType.cc
===================================================================
--- src/ResolvExpr/CommonType.cc	(revision f02f546a0bb9f23075f612531e3b22bef6122da8)
+++ src/ResolvExpr/CommonType.cc	(revision 2fe64ba26227e1e591b44541e61ad07f4d8d7946)
@@ -696,17 +696,4 @@
 		void postvisit( const ast::BasicType * basic ) {
 			if ( auto basic2 = dynamic_cast< const ast::BasicType * >( type2 ) ) {
-				#warning remove casts when `commonTypes` moved to new AST
-				
-				/*
-				ast::BasicType::Kind kind = (ast::BasicType::Kind)(int)commonTypes[ (BasicType::Kind)(int)basic->kind ][ (BasicType::Kind)(int)basic2->kind ];
-				if (
-					( ( kind == basic->kind && basic->qualifiers >= basic2->qualifiers )
-						|| widen.first )
-					&& ( ( kind == basic2->kind && basic->qualifiers <= basic2->qualifiers )
-						|| widen.second )
-				) {
-					result = new ast::BasicType{ kind, basic->qualifiers | basic2->qualifiers };
-				}
-				*/
 				ast::BasicType::Kind kind;
 				if (basic->kind != basic2->kind && !widen.first && !widen.second) return;
@@ -719,28 +706,17 @@
 					result = new ast::BasicType{ kind, basic->qualifiers | basic2->qualifiers };
 				}
-				
 			} else if (
 				dynamic_cast< const ast::ZeroType * >( type2 )
 				|| dynamic_cast< const ast::OneType * >( type2 )
 			) {
-				#warning remove casts when `commonTypes` moved to new AST
-				ast::BasicType::Kind kind = (ast::BasicType::Kind)(int)commonTypes[ (BasicType::Kind)(int)basic->kind ][ (BasicType::Kind)(int)ast::BasicType::SignedInt ];
-				/*
-				if ( // xxx - what does qualifier even do here??
-					( ( basic->qualifiers >= type2->qualifiers )
-						|| widen.first )
-					 && ( ( /* kind != basic->kind && basic->qualifiers <= type2->qualifiers )
-						|| widen.second )
-				) 
-				*/
 				if (widen.second) {
 					result = new ast::BasicType{ basic->kind, basic->qualifiers | type2->qualifiers };
 				}
 			} else if ( const ast::EnumInstType * enumInst = dynamic_cast< const ast::EnumInstType * >( type2 ) ) {
-				#warning remove casts when `commonTypes` moved to new AST
 				const ast::EnumDecl* enumDecl = enumInst->base;
 				if ( enumDecl->base ) {
 					result = enumDecl->base.get();
 				} else {
+					#warning remove casts when `commonTypes` moved to new AST
 					ast::BasicType::Kind kind = (ast::BasicType::Kind)(int)commonTypes[ (BasicType::Kind)(int)basic->kind ][ (BasicType::Kind)(int)ast::BasicType::SignedInt ];
 					if (
@@ -763,5 +739,4 @@
 				auto entry = open.find( *var );
 				if ( entry != open.end() ) {
-				// if (tenv.lookup(*var)) {
 					ast::AssertionSet need, have;
 					if ( ! tenv.bindVar(
Index: src/ResolvExpr/Unify.cc
===================================================================
--- src/ResolvExpr/Unify.cc	(revision f02f546a0bb9f23075f612531e3b22bef6122da8)
+++ src/ResolvExpr/Unify.cc	(revision 2fe64ba26227e1e591b44541e61ad07f4d8d7946)
@@ -1298,23 +1298,7 @@
 		auto var1 = dynamic_cast< const ast::TypeInstType * >( type1 );
 		auto var2 = dynamic_cast< const ast::TypeInstType * >( type2 );
-		ast::OpenVarSet::const_iterator
-			entry1 = var1 ? open.find( *var1 ) : open.end(),
-			entry2 = var2 ? open.find( *var2 ) : open.end();
-		// bool isopen1 = entry1 != open.end();
-		// bool isopen2 = entry2 != open.end();
 		bool isopen1 = var1 && env.lookup(*var1);
 		bool isopen2 = var2 && env.lookup(*var2);
 
-		/*
-		if ( isopen1 && isopen2 ) {
-			if ( entry1->second.kind != entry2->second.kind ) return false;
-			return env.bindVarToVar(
-				var1, var2, ast::TypeData{ entry1->second, entry2->second }, need, have,
-				open, widen );
-		} else if ( isopen1 ) {
-			return env.bindVar( var1, type2, entry1->second, need, have, open, widen );
-		} else if ( isopen2 ) {
-			return env.bindVar( var2, type1, entry2->second, need, have, open, widen, symtab );
-		} */
 		if ( isopen1 && isopen2 ) {
 			if ( var1->base->kind != var2->base->kind ) return false;
@@ -1326,9 +1310,8 @@
 		} else if ( isopen2 ) {
 			return env.bindVar( var2, type1, ast::TypeData{var2->base}, need, have, open, widen );
-		}else {
+		} else {
 			return ast::Pass<Unify_new>::read(
 				type1, type2, env, need, have, open, widen );
 		}
-		
 	}