Index: src/ResolvExpr/AlternativeFinder.cc
===================================================================
--- src/ResolvExpr/AlternativeFinder.cc	(revision 054514d366b6a7a6863d673a9c760baa03661f21)
+++ src/ResolvExpr/AlternativeFinder.cc	(revision 25fcb84f4d4e0dd6a778f8ce5a1bb0777e946a31)
@@ -299,6 +299,6 @@
 		// it's okay for the aggregate expression to have reference type -- cast it to the base type to treat the aggregate as the referenced value
 		std::unique_ptr<Expression> aggrExpr( alt.expr->clone() );
-		alt.env.apply( aggrExpr->get_result() );
-		Type * aggrType = aggrExpr->get_result();
+		alt.env.apply( aggrExpr->result );
+		Type * aggrType = aggrExpr->result;
 		if ( dynamic_cast< ReferenceType * >( aggrType ) ) {
 			aggrType = aggrType->stripReferences();
@@ -306,8 +306,8 @@
 		}
 
-		if ( StructInstType *structInst = dynamic_cast< StructInstType* >( aggrExpr->get_result() ) ) {
+		if ( StructInstType *structInst = dynamic_cast< StructInstType* >( aggrExpr->result ) ) {
 			NameExpr nameExpr( "" );
 			addAggMembers( structInst, aggrExpr.get(), alt.cost+Cost::safe, alt.env, &nameExpr );
-		} else if ( UnionInstType *unionInst = dynamic_cast< UnionInstType* >( aggrExpr->get_result() ) ) {
+		} else if ( UnionInstType *unionInst = dynamic_cast< UnionInstType* >( aggrExpr->result ) ) {
 			NameExpr nameExpr( "" );
 			addAggMembers( unionInst, aggrExpr.get(), alt.cost+Cost::safe, alt.env, &nameExpr );
@@ -320,5 +320,5 @@
 		NameExpr * nameExpr = dynamic_cast< NameExpr * >( member );
 		if ( ! nameExpr ) return;
-		const std::string & name = nameExpr->get_name();
+		const std::string & name = nameExpr->name;
 		std::list< Declaration* > members;
 		aggInst->lookup( name, members );