Index: src/Concurrency/Keywords.cc
===================================================================
--- src/Concurrency/Keywords.cc	(revision bbbc067e84adc59b31d39e97991980bf6379934a)
+++ src/Concurrency/Keywords.cc	(revision 2f42718dd1dafad85f808eaefd91c3a4c1871b20)
@@ -337,6 +337,6 @@
 		);
 
-		get_type->get_parameters().push_back( this_decl->clone() );
-		get_type->get_returnVals().push_back(
+		get_type->parameters.push_back( this_decl->clone() );
+		get_type->returnVals.push_back(
 			new ObjectDecl(
 				"ret",
@@ -371,5 +371,5 @@
 			FunctionType * main_type = new FunctionType( noQualifiers, false );
 
-			main_type->get_parameters().push_back( this_decl->clone() );
+			main_type->parameters.push_back( this_decl->clone() );
 
 			main_decl = new FunctionDecl(
@@ -405,5 +405,5 @@
 		);
 
-		decl->get_members().push_back( field );
+		decl->members.push_back( field );
 
 		return field;
@@ -418,6 +418,6 @@
 						field,
 						new CastExpr(
-							new VariableExpr( func->get_functionType()->get_parameters().front() ),
-							func->get_functionType()->get_parameters().front()->get_type()->stripReferences()->clone()
+							new VariableExpr( func->get_functionType()->parameters.front() ),
+							func->get_functionType()->parameters.front()->get_type()->stripReferences()->clone()
 						)
 					)
@@ -449,5 +449,5 @@
 			// If this is the destructor for a monitor it must be mutex
 			if(isDtor) {
-				Type* ty = decl->get_functionType()->get_parameters().front()->get_type();
+				Type* ty = decl->get_functionType()->parameters.front()->get_type();
 
 				// If it's a copy, it's not a mutex
@@ -483,5 +483,5 @@
 
 		// Check if we need to instrument the body
-		CompoundStmt* body = decl->get_statements();
+		CompoundStmt* body = decl->statements;
 		if( ! body ) return;
 
@@ -519,5 +519,5 @@
 
 		bool once = true;
-		for( auto arg : decl->get_functionType()->get_parameters()) {
+		for( auto arg : decl->get_functionType()->parameters) {
 			//Find mutex arguments
 			Type* ty = arg->get_type();
@@ -681,5 +681,5 @@
 		}
 
-		DeclarationWithType * param = decl->get_functionType()->get_parameters().front();
+		DeclarationWithType * param = decl->get_functionType()->parameters.front();
 		auto type  = dynamic_cast< StructInstType * >( InitTweak::getPointerBase( param->get_type() ) );
 		if( type && type->get_baseStruct()->is_thread() ) {