Index: src/Tuples/TupleAssignment.cc
===================================================================
--- src/Tuples/TupleAssignment.cc	(revision d01811a94377660e716d4f0cb31d6ed215989e56)
+++ src/Tuples/TupleAssignment.cc	(revision 4f68f6dbbf6cb8fc2136ecc466957b4498ccb3aa)
@@ -154,5 +154,5 @@
 						lhsAlt.expr = new CastExpr( lhsAlt.expr,
 								new ReferenceType( Type::Qualifiers(),
-									lhsAlt.expr->get_result()->clone() ) );
+									lhsAlt.expr->result->clone() ) );
 					}
 
@@ -298,7 +298,7 @@
 	ObjectDecl * TupleAssignSpotter::Matcher::newObject( UniqueName & namer, Expression * expr ) {
 		assert( expr->result && ! expr->get_result()->isVoid() );
-		ObjectDecl * ret = new ObjectDecl( namer.newName(), Type::StorageClasses(), LinkageSpec::Cforall, nullptr, expr->get_result()->clone(), new SingleInit( expr->clone() ) );
+		ObjectDecl * ret = new ObjectDecl( namer.newName(), Type::StorageClasses(), LinkageSpec::Cforall, nullptr, expr->result->clone(), new SingleInit( expr->clone() ) );
 		// if expression type is a reference, don't need to construct anything, a simple initializer is sufficient.
-		if ( ! dynamic_cast< ReferenceType * >( expr->get_result() ) ) {
+		if ( ! dynamic_cast< ReferenceType * >( expr->result ) ) {
 			ConstructorInit * ctorInit = InitTweak::genCtorInit( ret );
 			ret->init = ctorInit;
Index: src/Tuples/TupleExpansion.cc
===================================================================
--- src/Tuples/TupleExpansion.cc	(revision d01811a94377660e716d4f0cb31d6ed215989e56)
+++ src/Tuples/TupleExpansion.cc	(revision 4f68f6dbbf6cb8fc2136ecc466957b4498ccb3aa)
@@ -227,18 +227,18 @@
 
 	Expression * TupleIndexExpander::postmutate( TupleIndexExpr * tupleExpr ) {
-		Expression * tuple = tupleExpr->get_tuple();
+		Expression * tuple = tupleExpr->tuple;
 		assert( tuple );
-		tupleExpr->set_tuple( nullptr );
-		unsigned int idx = tupleExpr->get_index();
-		TypeSubstitution * env = tupleExpr->get_env();
-		tupleExpr->set_env( nullptr );
+		tupleExpr->tuple = nullptr;
+		unsigned int idx = tupleExpr->index;
+		TypeSubstitution * env = tupleExpr->env;
+		tupleExpr->env = nullptr;
 		delete tupleExpr;
 
-		StructInstType * type = strict_dynamic_cast< StructInstType * >( tuple->get_result() );
-		StructDecl * structDecl = type->get_baseStruct();
-		assert( structDecl->get_members().size() > idx );
-		Declaration * member = *std::next(structDecl->get_members().begin(), idx);
+		StructInstType * type = strict_dynamic_cast< StructInstType * >( tuple->result );
+		StructDecl * structDecl = type->baseStruct;
+		assert( structDecl->members.size() > idx );
+		Declaration * member = *std::next(structDecl->members.begin(), idx);
 		MemberExpr * memExpr = new MemberExpr( strict_dynamic_cast< DeclarationWithType * >( member ), tuple );
-		memExpr->set_env( env );
+		memExpr->env = env;
 		return memExpr;
 	}