Index: src/SymTab/Mangler.cc
===================================================================
--- src/SymTab/Mangler.cc	(revision ff5caaffaac4f11f28c574b27266ef608324781e)
+++ src/SymTab/Mangler.cc	(revision 4cf2472f2b5659dfb57b51b9748e18e9dcb9c543)
@@ -69,6 +69,6 @@
 				typedef std::map< std::string, std::pair< std::string, int > > VarMapType;
 				VarMapType varNums;             ///< Map of type variables to indices
+				int nextVarNum;                 ///< Next type variable index
 				const ResolvExpr::TypeEnvironment* env;  ///< optional environment for substitutions
-				int nextVarNum;                 ///< Next type variable index
 				bool isTopLevel;                ///< Is the Mangler at the top level
 				bool mangleOverridable;         ///< Specially mangle overridable built-in methods
@@ -78,8 +78,10 @@
 				bool inQualifiedType = false;   ///< Add start/end delimiters around qualified type
 
+			  public:
 				Mangler( bool mangleOverridable, bool typeMode, bool mangleGenericParams, 
 					int nextVarNum, const ResolvExpr::TypeEnvironment* env, 
 					const VarMapType& varNums );
 
+			  private:
 				void mangleDecl( DeclarationWithType *declaration );
 				void mangleRef( ReferenceToType *refType, std::string prefix );
@@ -127,5 +129,5 @@
 				int nextVarNum, const ResolvExpr::TypeEnvironment* env, 
 				const VarMapType& varNums )
-				: nextVarNum( nextVarNum ), varNums( varNums ), env( env ), isTopLevel( false ), 
+				: varNums( varNums ), nextVarNum( nextVarNum ), env( env ), isTopLevel( false ), 
 				mangleOverridable( mangleOverridable ), typeMode( typeMode ), 
 				mangleGenericParams( mangleGenericParams ) {}
@@ -359,5 +361,5 @@
 						// replace type with substitution name if environment is available and bound
 						if ( env ) {
-							const EqvClass* varClass = env->lookup( (*i)->name );
+							const ResolvExpr::EqvClass* varClass = env->lookup( (*i)->name );
 							if ( varClass && varClass->type ) {
 								PassVisitor<Mangler> sub_mangler(