Index: src/InitTweak/FixInit.cc
===================================================================
--- src/InitTweak/FixInit.cc	(revision 43e0949c5f8c1f5a4cfb68e9506dd718e55a6b07)
+++ src/InitTweak/FixInit.cc	(revision 2f42718dd1dafad85f808eaefd91c3a4c1871b20)
@@ -1042,6 +1042,6 @@
 			if ( checkWarnings( function ) ) {
 				FunctionType * type = function->get_functionType();
-				assert( ! type->get_parameters().empty() );
-				thisParam = strict_dynamic_cast< ObjectDecl * >( type->get_parameters().front() );
+				assert( ! type->parameters.empty() );
+				thisParam = strict_dynamic_cast< ObjectDecl * >( type->parameters.front() );
 				Type * thisType = getPointerBase( thisParam->get_type() );
 				StructInstType * structType = dynamic_cast< StructInstType * >( thisType );
@@ -1099,5 +1099,5 @@
 					if ( isCopyConstructor( function ) ) {
 						// if copy ctor, need to pass second-param-of-this-function.field
-						std::list< DeclarationWithType * > & params = function->get_functionType()->get_parameters();
+						auto & params = function->get_functionType()->parameters;
 						assert( params.size() == 2 );
 						arg2 = new MemberExpr( field, new VariableExpr( params.back() ) );
Index: src/InitTweak/GenInit.cc
===================================================================
--- src/InitTweak/GenInit.cc	(revision 43e0949c5f8c1f5a4cfb68e9506dd718e55a6b07)
+++ src/InitTweak/GenInit.cc	(revision 2f42718dd1dafad85f808eaefd91c3a4c1871b20)
@@ -127,5 +127,5 @@
 
 	void ReturnFixer::premutate( ReturnStmt *returnStmt ) {
-		std::list< DeclarationWithType * > & returnVals = ftype->get_returnVals();
+		auto & returnVals = ftype->returnVals;
 		assert( returnVals.size() == 0 || returnVals.size() == 1 );
 		// hands off if the function returns a reference - we don't want to allocate a temporary if a variable's address
@@ -242,5 +242,5 @@
 		// if this function is a user-defined constructor or destructor, mark down the type as "managed"
 		if ( ! LinkageSpec::isOverridable( dwt->get_linkage() ) && CodeGen::isCtorDtor( dwt->get_name() ) ) {
-			std::list< DeclarationWithType * > & params = GenPoly::getFunctionType( dwt->get_type() )->get_parameters();
+			auto & params = GenPoly::getFunctionType( dwt->get_type() )->parameters;
 			assert( ! params.empty() );
 			Type * type = InitTweak::getPointerBase( params.front()->get_type() );
@@ -335,5 +335,5 @@
 		// go through assertions and recursively add seen ctor/dtors
 		for ( auto & tyDecl : functionDecl->get_functionType()->get_forall() ) {
-			for ( DeclarationWithType *& assertion : tyDecl->get_assertions() ) {
+			for ( DeclarationWithType *& assertion : tyDecl->assertions ) {
 				managedTypes.handleDWT( assertion );
 			}
Index: src/InitTweak/InitTweak.cc
===================================================================
--- src/InitTweak/InitTweak.cc	(revision 43e0949c5f8c1f5a4cfb68e9506dd718e55a6b07)
+++ src/InitTweak/InitTweak.cc	(revision 2f42718dd1dafad85f808eaefd91c3a4c1871b20)
@@ -410,5 +410,5 @@
 				FunctionType *funcType = GenPoly::getFunctionType( appExpr->function->result );
 				assert( funcType );
-				return funcType->get_parameters().size() == 1;
+				return funcType->parameters.size() == 1;
 			}
 			return false;
@@ -616,5 +616,5 @@
 		if ( ftype->parameters.size() != 2 ) return nullptr;
 
-		Type * t1 = getPointerBase( ftype->get_parameters().front()->get_type() );
+		Type * t1 = getPointerBase( ftype->parameters.front()->get_type() );
 		Type * t2 = ftype->parameters.back()->get_type();
 		assert( t1 );