Index: src/GenPoly/GenPoly.cc
===================================================================
--- src/GenPoly/GenPoly.cc	(revision c1fb39031c7d3ae5be97439b65a6ed6e7c5bd703)
+++ src/GenPoly/GenPoly.cc	(revision 93c10dee6eb516206f8cb00b620e8ee4abfb79f8)
@@ -783,5 +783,5 @@
 	const ast::FunctionType * function = getFunctionType( expr->func->result );
 	assertf( function, "ApplicationExpr has non-function type: %s", toString( expr->func->result ).c_str() );
-	TypeVarMap exprTyVars = { ast::TypeDecl::Data() };
+	TypeVarMap exprTyVars = { ast::TypeData() };
 	makeTypeVarMap( function, exprTyVars );
 	return needsBoxing( param, arg, exprTyVars, subst );
@@ -793,5 +793,5 @@
 
 void addToTypeVarMap( const ast::TypeInstType * type, TypeVarMap & typeVars ) {
-	typeVars.insert( *type, ast::TypeDecl::Data( type->base ) );
+	typeVars.insert( *type, ast::TypeData( type->base ) );
 }
 
Index: src/GenPoly/GenPoly.h
===================================================================
--- src/GenPoly/GenPoly.h	(revision c1fb39031c7d3ae5be97439b65a6ed6e7c5bd703)
+++ src/GenPoly/GenPoly.h	(revision 93c10dee6eb516206f8cb00b620e8ee4abfb79f8)
@@ -30,5 +30,5 @@
 
 	typedef ErasableScopedMap< std::string, TypeDecl::Data > TyVarMap;
-	using TypeVarMap = ErasableScopedMap< ast::TypeInstType::TypeEnvKey, ast::TypeDecl::Data >;
+	using TypeVarMap = ErasableScopedMap< ast::TypeEnvKey, ast::TypeData >;
 
 	/// Replaces a TypeInstType by its referrent in the environment, if applicable