Index: src/InitTweak/FixGlobalInit.cc
===================================================================
--- src/InitTweak/FixGlobalInit.cc	(revision 1be845ba920bd9b049f4c3616eef9ec943dea16d)
+++ src/InitTweak/FixGlobalInit.cc	(revision 099f5bd89280f731be10e231528cb8985b7f5d0c)
@@ -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;