Index: src/GenPoly/Box.cc
===================================================================
--- src/GenPoly/Box.cc	(revision bcc09464085fdb6198737f2486429509a330950f)
+++ src/GenPoly/Box.cc	(revision 029e330b283c44e17d2562ee6adbcdc8ded8877b)
@@ -657,10 +657,10 @@
 				paramExpr = new AddressExpr( paramExpr );
 			} // if
-			arg = appExpr->get_args().insert( arg, paramExpr ); // add argument to function call
+			arg = appExpr->args.insert( arg, paramExpr ); // add argument to function call
 			arg++;
 			// Build a comma expression to call the function and emulate a normal return.
 			CommaExpr *commaExpr = new CommaExpr( appExpr, retExpr );
-			commaExpr->set_env( appExpr->get_env() );
-			appExpr->set_env( 0 );
+			commaExpr->env = appExpr->env;
+			appExpr->env = nullptr;
 			return commaExpr;
 		}
@@ -708,5 +708,5 @@
 //			if ( ! function->get_returnVals().empty() && isPolyType( function->get_returnVals().front()->get_type(), tyVars ) ) {
 			if ( isDynRet( function, tyVars ) ) {
-				ret = addRetParam( appExpr, function->get_returnVals().front()->get_type(), arg );
+				ret = addRetParam( appExpr, function->returnVals.front()->get_type(), arg );
 			} // if
 			std::string mangleName = mangleAdapterName( function, tyVars );
@@ -715,5 +715,5 @@
 			// cast adaptee to void (*)(), since it may have any type inside a polymorphic function
 			Type * adapteeType = new PointerType( Type::Qualifiers(), new FunctionType( Type::Qualifiers(), true ) );
-			appExpr->get_args().push_front( new CastExpr( appExpr->get_function(), adapteeType ) );
+			appExpr->get_args().push_front( new CastExpr( appExpr->function, adapteeType ) );
 			appExpr->set_function( new NameExpr( adapterName ) ); // xxx - result is never set on NameExpr
 
@@ -1764,7 +1764,7 @@
 
 		Expression *PolyGenericCalculator::postmutate( SizeofExpr *sizeofExpr ) {
-			Type *ty = sizeofExpr->get_isType() ? 
+			Type *ty = sizeofExpr->get_isType() ?
 				sizeofExpr->get_type() : sizeofExpr->get_expr()->get_result();
-			
+
 			Expression * gen = genSizeof( ty );
 			if ( gen ) {