Index: src/InitTweak/FixGlobalInit.cc
===================================================================
--- src/InitTweak/FixGlobalInit.cc	(revision 1be845ba920bd9b049f4c3616eef9ec943dea16d)
+++ src/InitTweak/FixGlobalInit.cc	(revision f0728921836dddcda765c8e1d819f407d111abb0)
@@ -102,23 +102,23 @@
 		if ( ConstructorInit * ctorInit = dynamic_cast< ConstructorInit * >( objDecl->get_init() ) ) {
 			// a decision should have been made by the resolver, so ctor and init are not both non-NULL
-			assert( ! ctorInit->get_ctor() || ! ctorInit->get_init() );
+			assert( ! ctorInit->ctor || ! ctorInit->init );
 
-			Statement * dtor = ctorInit->get_dtor();
+			Statement * dtor = ctorInit->dtor;
 			if ( dtor && ! isIntrinsicSingleArgCallStmt( dtor ) ) {
 				// don't need to call intrinsic dtor, because it does nothing, but
 				// non-intrinsic dtors must be called
 				destroyStatements.push_front( dtor );
-				ctorInit->set_dtor( NULL );
+				ctorInit->dtor = nullptr;
 			} // if
-			if ( Statement * ctor = ctorInit->get_ctor() ) {
+			if ( Statement * ctor = ctorInit->ctor ) {
 				initStatements.push_back( ctor );
-				objDecl->set_init( NULL );
-				ctorInit->set_ctor( NULL );
-			} else if ( Initializer * init = ctorInit->get_init() ) {
-				objDecl->set_init( init );
-				ctorInit->set_init( NULL );
+				objDecl->init = nullptr;
+				ctorInit->ctor = nullptr;
+			} else if ( Initializer * init = ctorInit->init ) {
+				objDecl->init = init;
+				ctorInit->init = nullptr;
 			} else {
 				// no constructor and no initializer, which is okay
-				objDecl->set_init( NULL );
+				objDecl->init = nullptr;
 			} // if
 			delete ctorInit;
Index: src/InitTweak/InitTweak.cc
===================================================================
--- src/InitTweak/InitTweak.cc	(revision 1be845ba920bd9b049f4c3616eef9ec943dea16d)
+++ src/InitTweak/InitTweak.cc	(revision f0728921836dddcda765c8e1d819f407d111abb0)
@@ -408,5 +408,5 @@
 		return allofCtorDtor( stmt, []( Expression * callExpr ){
 			if ( ApplicationExpr * appExpr = isIntrinsicCallExpr( callExpr ) ) {
-				FunctionType *funcType = GenPoly::getFunctionType( appExpr->get_function()->get_result() );
+				FunctionType *funcType = GenPoly::getFunctionType( appExpr->function->result );
 				assert( funcType );
 				return funcType->get_parameters().size() == 1;
Index: src/ResolvExpr/CurrentObject.cc
===================================================================
--- src/ResolvExpr/CurrentObject.cc	(revision 1be845ba920bd9b049f4c3616eef9ec943dea16d)
+++ src/ResolvExpr/CurrentObject.cc	(revision f0728921836dddcda765c8e1d819f407d111abb0)
@@ -139,8 +139,8 @@
 		ArrayIterator( ArrayType * at ) : array( at ) {
 			PRINT( std::cerr << "Creating array iterator: " << at << std::endl; )
-			base = at->get_base();
+			base = at->base;
 			memberIter = createMemberIterator( base );
-			if ( at->isVarLen ) SemanticError( at, "VLA initialization does not support @=" );
-			setSize( at->get_dimension() );
+			if ( at->isVarLen ) SemanticError( at, "VLA initialization does not support @=: " );
+			setSize( at->dimension );
 		}
 
Index: src/SymTab/Validate.cc
===================================================================
--- src/SymTab/Validate.cc	(revision 1be845ba920bd9b049f4c3616eef9ec943dea16d)
+++ src/SymTab/Validate.cc	(revision f0728921836dddcda765c8e1d819f407d111abb0)
@@ -1232,7 +1232,7 @@
 	void ArrayLength::previsit( ObjectDecl * objDecl ) {
 		if ( ArrayType * at = dynamic_cast< ArrayType * >( objDecl->type ) ) {
-			if ( at->get_dimension() ) return;
+			if ( at->dimension ) return;
 			if ( ListInit * init = dynamic_cast< ListInit * >( objDecl->init ) ) {
-				at->set_dimension( new ConstantExpr( Constant::from_ulong( init->initializers.size() ) ) );
+				at->dimension = new ConstantExpr( Constant::from_ulong( init->initializers.size() ) );
 			}
 		}