Index: src/InitTweak/InitTweak.cc
===================================================================
--- src/InitTweak/InitTweak.cc	(revision 18ca28e698989f58b5b3b02c373ad9977156462e)
+++ src/InitTweak/InitTweak.cc	(revision 6fc5c14c6f831f36aaf4f6736da31f67985da917)
@@ -353,9 +353,9 @@
 			assert( expr );
 			if ( VariableExpr * varExpr = dynamic_cast< VariableExpr * >( expr ) ) {
-				return varExpr->get_var();
+				return varExpr->var;
 			} else if ( MemberExpr * memberExpr = dynamic_cast< MemberExpr * >( expr ) ) {
-				return memberExpr->get_member();
+				return memberExpr->member;
 			} else if ( CastExpr * castExpr = dynamic_cast< CastExpr * >( expr ) ) {
-				return getCalledFunction( castExpr->get_arg() );
+				return getCalledFunction( castExpr->arg );
 			} else if ( UntypedExpr * untypedExpr = dynamic_cast< UntypedExpr * >( expr ) ) {
 				return handleDerefCalledFunction( untypedExpr );
@@ -363,5 +363,7 @@
 				return handleDerefCalledFunction( appExpr );
 			} else if ( AddressExpr * addrExpr = dynamic_cast< AddressExpr * >( expr ) ) {
-				return getCalledFunction( addrExpr->get_arg() );
+				return getCalledFunction( addrExpr->arg );
+			} else if ( CommaExpr * commaExpr = dynamic_cast< CommaExpr * >( expr ) ) {
+				return getCalledFunction( commaExpr->arg2 );
 			}
 			return nullptr;