Index: src/GenPoly/CopyParams.cc
===================================================================
--- src/GenPoly/CopyParams.cc	(revision 582ee2851d02bc30a951c8b62bf2576587e3ad25)
+++ src/GenPoly/CopyParams.cc	(revision 9dbf7c8c2d637a1c6898bc9874f8560581d06476)
@@ -40,5 +40,5 @@
 
 	  private:
-		std::set< UniqueId > modVars;
+		std::set< DeclarationWithType * > modVars;
 		UniqueName namer;
 	};
@@ -68,8 +68,7 @@
 				} // for
 				for ( std::list< DeclarationWithType* >::iterator param = funcDecl->type->parameters.begin(); param != funcDecl->type->parameters.end(); ++param ) {
-					std::set< UniqueId >::const_iterator var = modVars.find( (*param)->get_uniqueId() );
+					std::set< DeclarationWithType * >::const_iterator var = modVars.find( *param );
 					if ( var != modVars.end() ) {
 						TypeInstType *typeInst = dynamic_cast< TypeInstType* >( (*param)->get_type() );
-						assertf( typeInst, "Found in modVars for function %s: unique id: %u, %s", funcDecl->name.c_str(), (*param)->get_uniqueId(), toString( *param ).c_str() );
 						std::map< std::string, DeclarationWithType* >::const_iterator assignOp = assignOps.find( typeInst->name );
 						if ( assignOp != assignOps.end() ) {
@@ -99,7 +98,5 @@
 		if ( VariableExpr *varExpr = dynamic_cast< VariableExpr* >( addrExpr->arg ) ) {
 			if ( dynamic_cast< TypeInstType* >( varExpr->var->get_type() ) ) {
-				assertf( varExpr->var->get_uniqueId(), "Address-taken variable does not have a unique ID: %s", toString( varExpr->var ).c_str() );
-				modVars.insert( varExpr->var->get_uniqueId() );
-				std::cerr << "added unique id: " << varExpr->var->get_uniqueId() << " var: " << varExpr->var << std::endl;
+				modVars.insert( varExpr->var );
 			} // if
 		} // if
Index: src/main.cc
===================================================================
--- src/main.cc	(revision 582ee2851d02bc30a951c8b62bf2576587e3ad25)
+++ src/main.cc	(revision 9dbf7c8c2d637a1c6898bc9874f8560581d06476)
@@ -321,8 +321,8 @@
 		OPTPRINT("instantiateGenerics")
 		GenPoly::instantiateGeneric( translationUnit );
+		OPTPRINT( "convertLvalue" )
+		GenPoly::convertLvalue( translationUnit );
 		OPTPRINT( "copyParams" );
 		GenPoly::copyParams( translationUnit );
-		OPTPRINT( "convertLvalue" )
-		GenPoly::convertLvalue( translationUnit );
 
 		if ( bboxp ) {