Index: src/GenPoly/Box.cc
===================================================================
--- src/GenPoly/Box.cc	(revision bed4c63e6705d5b6c020d4f687b6de771de36626)
+++ src/GenPoly/Box.cc	(revision ac633d0974fbb4e8ab841c7fa9c8a858292ba9da)
@@ -135,5 +135,4 @@
 			InstantiationMap() { beginScope(); }
 
-//		private:
 			/// Gets the value for the concrete instantiation of this type, assuming it has already been instantiated in the current scope.
 			/// Returns NULL on none such.
@@ -153,9 +152,5 @@
 				return 0;
 			}
-		public:
-//			StructDecl* lookup( StructInstType *inst, const std::list< TypeExpr* > &typeSubs ) { return (StructDecl*)lookup( inst->get_baseStruct(), typeSubs ); }
-//			UnionDecl* lookup( UnionInstType *inst, const std::list< TypeExpr* > &typeSubs ) { return (UnionDecl*)lookup( inst->get_baseUnion(), typeSubs ); }
-
-//		private:
+
 			/// Adds a value for a concrete type to the current scope
 			void insert( AggregateDecl *generic, const std::list< TypeExpr* > &params, Value *value ) {
@@ -163,7 +158,4 @@
 				scopes.back()[generic].push_back( Instantiation( key, value ) );
 			}
-//		public:
-//			void insert( StructInstType *inst, const std::list< TypeExpr* > &typeSubs, StructDecl *decl ) { insert( inst->get_baseStruct(), typeSubs, decl ); }
-//			void insert( UnionInstType *inst, const std::list< TypeExpr* > &typeSubs, UnionDecl *decl ) { insert( inst->get_baseUnion(), typeSubs, decl ); }
 		};
 
@@ -348,5 +340,4 @@
 		mutateTranslationUnit/*All*/( translationUnit, pass1 );
 		mutateTranslationUnit/*All*/( translationUnit, pass2 );
-//		instantiateGeneric( translationUnit );
 		instantiator.mutateDeclarationList( translationUnit );
 		mutateTranslationUnit/*All*/( translationUnit, memberFixer );
@@ -1587,5 +1578,4 @@
 			ObjectDecl newPtr( "", DeclarationNode::NoStorageClass, LinkageSpec::C, 0,
 			                   new PointerType( Type::Qualifiers(), new BasicType( Type::Qualifiers(), BasicType::LongUnsignedInt ) ), 0 );
-//   ObjectDecl *newFunPtr = new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, new PointerType( Type::Qualifiers(), new FunctionType( Type::Qualifiers(), true ) ), 0 );
 			for ( std::list< TypeDecl *>::const_iterator tyParm = funcType->get_forall().begin(); tyParm != funcType->get_forall().end(); ++tyParm ) {
 				ObjectDecl *sizeParm, *alignParm;