Index: src/ResolvExpr/Unify.cc
===================================================================
--- src/ResolvExpr/Unify.cc	(revision b8a52f55d70817296180e4dbf9fe1bf08cae15b2)
+++ src/ResolvExpr/Unify.cc	(revision 538334a8bcf1d5f551c5fe85bd3e12d8e5f74aa5)
@@ -580,7 +580,7 @@
 
 			// sizes don't have to match if ttypes are involved; need to be more precise wrt where the ttype is to prevent errors
-			if ( (flatFunc->get_parameters().size() == flatOther->get_parameters().size() && flatFunc->get_returnVals().size() == flatOther->get_returnVals().size()) || flatFunc->isTtype() || flatOther->isTtype() ) {
-				if ( unifyDeclList( flatFunc->get_parameters().begin(), flatFunc->get_parameters().end(), flatOther->get_parameters().begin(), flatOther->get_parameters().end(), env, needAssertions, haveAssertions, openVars, indexer ) ) {
-					if ( unifyDeclList( flatFunc->get_returnVals().begin(), flatFunc->get_returnVals().end(), flatOther->get_returnVals().begin(), flatOther->get_returnVals().end(), env, needAssertions, haveAssertions, openVars, indexer ) ) {
+			if ( (flatFunc->parameters.size() == flatOther->parameters.size() && flatFunc->returnVals.size() == flatOther->returnVals.size()) || flatFunc->isTtype() || flatOther->isTtype() ) {
+				if ( unifyDeclList( flatFunc->parameters.begin(), flatFunc->parameters.end(), flatOther->parameters.begin(), flatOther->parameters.end(), env, needAssertions, haveAssertions, openVars, indexer ) ) {
+					if ( unifyDeclList( flatFunc->returnVals.begin(), flatFunc->returnVals.end(), flatOther->returnVals.begin(), flatOther->returnVals.end(), env, needAssertions, haveAssertions, openVars, indexer ) ) {
 
 						// the original types must be used in mark assertions, since pointer comparisons are used
@@ -599,5 +599,5 @@
 		// check that other type is compatible and named the same
 		RefType *otherStruct = dynamic_cast< RefType* >( other );
-		result = otherStruct && inst->get_name() == otherStruct->get_name();
+		result = otherStruct && inst->name == otherStruct->name;
 	}
 
@@ -608,6 +608,6 @@
 		if ( ! result ) return;
 		// Check that parameters of types unify, if any
-		std::list< Expression* > params = inst->get_parameters();
-		std::list< Expression* > otherParams = ((RefType*)other)->get_parameters();
+		std::list< Expression* > params = inst->parameters;
+		std::list< Expression* > otherParams = ((RefType*)other)->parameters;
 
 		std::list< Expression* >::const_iterator it = params.begin(), jt = otherParams.begin();