Index: src/ResolvExpr/CandidateFinder.cpp
===================================================================
--- src/ResolvExpr/CandidateFinder.cpp	(revision 93d2219a70113e973cd8ff2d973d1fdec40ac805)
+++ src/ResolvExpr/CandidateFinder.cpp	(revision 93c10dee6eb516206f8cb00b620e8ee4abfb79f8)
@@ -221,5 +221,5 @@
 	) {
 		for ( auto & tyvar : type->forall ) {
-			unifiableVars[ *tyvar ] = ast::TypeDecl::Data{ tyvar->base };
+			unifiableVars[ *tyvar ] = ast::TypeData{ tyvar->base };
 		}
 		for ( auto & assn : type->assertions ) {
Index: src/ResolvExpr/FindOpenVars.cc
===================================================================
--- src/ResolvExpr/FindOpenVars.cc	(revision 93d2219a70113e973cd8ff2d973d1fdec40ac805)
+++ src/ResolvExpr/FindOpenVars.cc	(revision 93c10dee6eb516206f8cb00b620e8ee4abfb79f8)
@@ -113,5 +113,5 @@
 				if ( nextIsOpen ) {
 					for ( auto & decl : type->forall ) {
-						open[ *decl ] = ast::TypeDecl::Data{ decl->base };
+						open[ *decl ] = ast::TypeData{ decl->base };
 					}
 					for ( auto & assert : type->assertions ) {
@@ -120,5 +120,5 @@
 				} else {
 					for ( auto & decl : type->forall ) {
-						closed[ *decl ] = ast::TypeDecl::Data{ decl->base };	
+						closed[ *decl ] = ast::TypeData{ decl->base };
 					}
 					for ( auto & assert : type->assertions ) {
Index: src/ResolvExpr/RenameVars.cc
===================================================================
--- src/ResolvExpr/RenameVars.cc	(revision 93d2219a70113e973cd8ff2d973d1fdec40ac805)
+++ src/ResolvExpr/RenameVars.cc	(revision 93c10dee6eb516206f8cb00b620e8ee4abfb79f8)
@@ -42,5 +42,5 @@
 		int next_usage_id = 1;
 		ScopedMap< std::string, std::string > nameMap;
-		ScopedMap< std::string, ast::TypeInstType::TypeEnvKey > idMap;
+		ScopedMap< std::string, ast::TypeEnvKey > idMap;
 	public:
 		void reset() {
@@ -121,6 +121,6 @@
 					assert(false);
 				}
-				idMap[ td->name ] = ast::TypeInstType::TypeEnvKey(*mut);
-				
+				idMap[ td->name ] = ast::TypeEnvKey( *mut );
+
 				td = mut;
 			}
Index: src/ResolvExpr/Unify.cc
===================================================================
--- src/ResolvExpr/Unify.cc	(revision 93d2219a70113e973cd8ff2d973d1fdec40ac805)
+++ src/ResolvExpr/Unify.cc	(revision 93c10dee6eb516206f8cb00b620e8ee4abfb79f8)
@@ -1166,5 +1166,5 @@
 			if ( entry1->second.kind != entry2->second.kind ) return false;
 			return env.bindVarToVar(
-				var1, var2, ast::TypeDecl::Data{ entry1->second, entry2->second }, need, have,
+				var1, var2, ast::TypeData{ entry1->second, entry2->second }, need, have,
 				open, widen, symtab );
 		} else if ( isopen1 ) {