Index: src/InitTweak/FixInit.cc
===================================================================
--- src/InitTweak/FixInit.cc	(revision 5382492c5430535de9cffa7dc941d8aa20acd78d)
+++ src/InitTweak/FixInit.cc	(revision c2ce235057f98752b61e14874034b2d792b4f1b7)
@@ -10,5 +10,5 @@
 // Created On       : Wed Jan 13 16:29:30 2016
 // Last Modified By : Rob Schluntz
-// Last Modified On : Tue Apr 26 11:35:31 2016
+// Last Modified On : Tue Apr 26 14:57:13 2016
 // Update Count     : 30
 //
@@ -228,4 +228,7 @@
 		// xxx - handle multiple return values
 		ApplicationExpr * callExpr = impCpCtorExpr->get_callExpr();
+		// xxx - is this right? callExpr may not have the right environment, because it was attached
+		// at a higher level. Trying to pass that environment along.
+		callExpr->set_env( impCpCtorExpr->get_env()->clone() );
 		for ( Type * result : appExpr->get_results() ) {
 			ObjectDecl * ret = new ObjectDecl( retNamer.newName(), DeclarationNode::NoStorageClass, LinkageSpec::C, 0, result->clone(), new SingleInit( callExpr ) );