Index: src/GenPoly/InstantiateGeneric.cc
===================================================================
--- src/GenPoly/InstantiateGeneric.cc	(revision 08e88514b1a5b79ea52c8bcb7e26e07cb0e75567)
+++ src/GenPoly/InstantiateGeneric.cc	(revision 9dc3eb21aaa56f0f92f0c321820e671a30ea502f)
@@ -172,5 +172,6 @@
 		InstantiationMap< AggregateDecl, AggregateDecl > instantiations;
 		/// Set of types which are dtype-only generic (and therefore have static layout)
-		ScopedSet< AggregateDecl* > dtypeStatics;
+		// ScopedSet< AggregateDecl* > dtypeStatics;
+		std::set<AggregateDecl *> dtypeStatics;
 		/// Namer for concrete types
 		UniqueName typeNamer;
@@ -505,10 +506,10 @@
 	void GenericInstantiator::beginScope() {
 		instantiations.beginScope();
-		dtypeStatics.beginScope();
+		//dtypeStatics.beginScope();
 	}
 
 	void GenericInstantiator::endScope() {
 		instantiations.endScope();
-		dtypeStatics.endScope();
+		//dtypeStatics.endScope();
 	}