Index: src/InitTweak/FixInit.cc
===================================================================
--- src/InitTweak/FixInit.cc	(revision bfd4974c5982bdb259066163ce97baab711df4ee)
+++ src/InitTweak/FixInit.cc	(revision be151bfb7d6e050ea312f07f97188a5d5debbbef)
@@ -323,8 +323,6 @@
 
 		Expression * InsertImplicitCalls::postmutate( ApplicationExpr * appExpr ) {
-			assert( appExpr );
-
 			if ( VariableExpr * function = dynamic_cast< VariableExpr * > ( appExpr->get_function() ) ) {
-				if ( LinkageSpec::isBuiltin( function->get_var()->get_linkage() ) ) {
+				if ( function->var->linkage.is_builtin ) {
 					// optimization: don't need to copy construct in order to call intrinsic functions
 					return appExpr;
@@ -332,7 +330,7 @@
 					FunctionType * ftype = dynamic_cast< FunctionType * >( GenPoly::getFunctionType( funcDecl->get_type() ) );
 					assertf( ftype, "Function call without function type: %s", toString( funcDecl ).c_str() );
-					if ( CodeGen::isConstructor( funcDecl->get_name() ) && ftype->get_parameters().size() == 2 ) {
-						Type * t1 = getPointerBase( ftype->get_parameters().front()->get_type() );
-						Type * t2 = ftype->get_parameters().back()->get_type();
+					if ( CodeGen::isConstructor( funcDecl->get_name() ) && ftype->parameters.size() == 2 ) {
+						Type * t1 = getPointerBase( ftype->parameters.front()->get_type() );
+						Type * t2 = ftype->parameters.back()->get_type();
 						assert( t1 );