Index: src/ResolvExpr/AlternativeFinder.cc
===================================================================
--- src/ResolvExpr/AlternativeFinder.cc	(revision 1dcd52a3b1a9c117e77099fbf3c110bd4fc97b85)
+++ src/ResolvExpr/AlternativeFinder.cc	(revision 44b41141bccae974eea50a7e612d003d7ed7e9fa)
@@ -1380,6 +1380,6 @@
 	void AlternativeFinder::Finder::postvisit( NameExpr *nameExpr ) {
 		std::list< SymTab::Indexer::IdData > declList;
-		indexer.lookupId( nameExpr->get_name(), declList );
-		PRINT( std::cerr << "nameExpr is " << nameExpr->get_name() << std::endl; )
+		indexer.lookupId( nameExpr->name, declList );
+		PRINT( std::cerr << "nameExpr is " << nameExpr->name << std::endl; )
 		for ( auto & data : declList ) {
 			Expression * newExpr = data.combine();
@@ -1402,5 +1402,5 @@
 		// not sufficient to clone here, because variable's type may have changed
 		// since the VariableExpr was originally created.
-		alternatives.push_back( Alternative( new VariableExpr( variableExpr->get_var() ), env, Cost::zero ) );
+		alternatives.push_back( Alternative( new VariableExpr( variableExpr->var ), env, Cost::zero ) );
 	}
 
@@ -1469,7 +1469,7 @@
 		// xxx - resolveTypeof?
 		if ( StructInstType *structInst = dynamic_cast< StructInstType* >( offsetofExpr->get_type() ) ) {
-			addOffsetof( structInst, offsetofExpr->get_member() );
+			addOffsetof( structInst, offsetofExpr->member );
 		} else if ( UnionInstType *unionInst = dynamic_cast< UnionInstType* >( offsetofExpr->get_type() ) ) {
-			addOffsetof( unionInst, offsetofExpr->get_member() );
+			addOffsetof( unionInst, offsetofExpr->member );
 		}
 	}
@@ -1548,12 +1548,12 @@
 		secondFinder.findWithAdjustment( logicalExpr->get_arg2() );
 		if ( secondFinder.alternatives.empty() ) return;
-		for ( AltList::const_iterator first = firstFinder.alternatives.begin(); first != firstFinder.alternatives.end(); ++first ) {
-			for ( AltList::const_iterator second = secondFinder.alternatives.begin(); second != secondFinder.alternatives.end(); ++second ) {
+		for ( const Alternative & first : firstFinder.alternatives ) {
+			for ( const Alternative & second : secondFinder.alternatives ) {
 				TypeEnvironment compositeEnv;
-				compositeEnv.simpleCombine( first->env );
-				compositeEnv.simpleCombine( second->env );
-
-				LogicalExpr *newExpr = new LogicalExpr( first->expr->clone(), second->expr->clone(), logicalExpr->get_isAnd() );
-				alternatives.push_back( Alternative( newExpr, compositeEnv, first->cost + second->cost ) );
+				compositeEnv.simpleCombine( first.env );
+				compositeEnv.simpleCombine( second.env );
+
+				LogicalExpr *newExpr = new LogicalExpr( first.expr->clone(), second.expr->clone(), logicalExpr->get_isAnd() );
+				alternatives.push_back( Alternative( newExpr, compositeEnv, first.cost + second.cost ) );
 			}
 		}
@@ -1605,6 +1605,6 @@
 		AlternativeFinder secondFinder( indexer, newEnv );
 		secondFinder.findWithAdjustment( commaExpr->get_arg2() );
-		for ( AltList::const_iterator alt = secondFinder.alternatives.begin(); alt != secondFinder.alternatives.end(); ++alt ) {
-			alternatives.push_back( Alternative( new CommaExpr( newFirstArg->clone(), alt->expr->clone() ), alt->env, alt->cost ) );
+		for ( const Alternative & alt : secondFinder.alternatives ) {
+			alternatives.push_back( Alternative( new CommaExpr( newFirstArg->clone(), alt.expr->clone() ), alt.env, alt.cost ) );
 		} // for
 		delete newFirstArg;
@@ -1614,21 +1614,21 @@
 		// resolve low and high, accept alternatives whose low and high types unify
 		AlternativeFinder firstFinder( indexer, env );
-		firstFinder.findWithAdjustment( rangeExpr->get_low() );
+		firstFinder.findWithAdjustment( rangeExpr->low );
 		if ( firstFinder.alternatives.empty() ) return;
 		AlternativeFinder secondFinder( indexer, env );
-		secondFinder.findWithAdjustment( rangeExpr->get_high() );
+		secondFinder.findWithAdjustment( rangeExpr->high );
 		if ( secondFinder.alternatives.empty() ) return;
-		for ( AltList::const_iterator first = firstFinder.alternatives.begin(); first != firstFinder.alternatives.end(); ++first ) {
-			for ( AltList::const_iterator second = secondFinder.alternatives.begin(); second != secondFinder.alternatives.end(); ++second ) {
+		for ( const Alternative & first : firstFinder.alternatives ) {
+			for ( const Alternative & second : secondFinder.alternatives ) {
 				TypeEnvironment compositeEnv;
-				compositeEnv.simpleCombine( first->env );
-				compositeEnv.simpleCombine( second->env );
+				compositeEnv.simpleCombine( first.env );
+				compositeEnv.simpleCombine( second.env );
 				OpenVarSet openVars;
 				AssertionSet needAssertions, haveAssertions;
-				Alternative newAlt( 0, compositeEnv, first->cost + second->cost );
+				Alternative newAlt( 0, compositeEnv, first.cost + second.cost );
 				Type* commonType = nullptr;
-				if ( unify( first->expr->get_result(), second->expr->get_result(), newAlt.env, needAssertions, haveAssertions, openVars, indexer, commonType ) ) {
-					RangeExpr *newExpr = new RangeExpr( first->expr->clone(), second->expr->clone() );
-					newExpr->set_result( commonType ? commonType : first->expr->get_result()->clone() );
+				if ( unify( first.expr->result, second.expr->result, newAlt.env, needAssertions, haveAssertions, openVars, indexer, commonType ) ) {
+					RangeExpr * newExpr = new RangeExpr( first.expr->clone(), second.expr->clone() );
+					newExpr->result = commonType ? commonType : first.expr->result->clone();
 					newAlt.expr = newExpr;
 					inferParameters( needAssertions, haveAssertions, newAlt, openVars, back_inserter( alternatives ) );