Index: src/ResolvExpr/AlternativeFinder.cc
===================================================================
--- src/ResolvExpr/AlternativeFinder.cc	(revision 721f17ac6221a75230b4b1228917e6a163b53ff6)
+++ src/ResolvExpr/AlternativeFinder.cc	(revision 09d789c493c816483fb88c49a900967b7addbd2c)
@@ -10,6 +10,6 @@
 // Created On       : Sat May 16 23:52:08 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jun 22 17:19:54 2015
-// Update Count     : 17
+// Last Modified On : Sat May 16 23:55:30 2015
+// Update Count     : 3
 //
 
@@ -107,11 +107,11 @@
 						PRINT(
 							std::cout << "cost " << candidate->cost << " beats " << mapPlace->second.candidate->cost << std::endl;
-						)
-						selected[ mangleName ] = current;
+							)
+							selected[ mangleName ] = current;
 					} else if ( candidate->cost == mapPlace->second.candidate->cost ) {
 						PRINT(
 							std::cout << "marking ambiguous" << std::endl;
-						)
-						mapPlace->second.isAmbiguous = true;
+							)
+							mapPlace->second.isAmbiguous = true;
 					}
 				} else {
@@ -122,16 +122,16 @@
 			PRINT(
 				std::cout << "there are " << selected.size() << " alternatives before elimination" << std::endl;
-			)
-
-			// accept the alternatives that were unambiguous
-			for ( std::map< std::string, PruneStruct >::iterator target = selected.begin(); target != selected.end(); ++target ) {
-				if ( ! target->second.isAmbiguous ) {
-					Alternative &alt = *target->second.candidate;
-					for ( std::list< Type* >::iterator result = alt.expr->get_results().begin(); result != alt.expr->get_results().end(); ++result ) {
-						alt.env.applyFree( *result );
+				)
+
+				// accept the alternatives that were unambiguous
+				for ( std::map< std::string, PruneStruct >::iterator target = selected.begin(); target != selected.end(); ++target ) {
+					if ( ! target->second.isAmbiguous ) {
+						Alternative &alt = *target->second.candidate;
+						for ( std::list< Type* >::iterator result = alt.expr->get_results().begin(); result != alt.expr->get_results().end(); ++result ) {
+							alt.env.applyFree( *result );
+						}
+						*out++ = alt;
 					}
-					*out++ = alt;
 				}
-			}
 
 		}
@@ -183,6 +183,6 @@
 				std::cout << "findSubExprs" << std::endl;
 				printAlts( finder.alternatives, std::cout );
-			)
-			*out++ = finder;
+				)
+				*out++ = finder;
 		}
 	}
@@ -205,9 +205,9 @@
 			std::cout << "alternatives before prune:" << std::endl;
 			printAlts( alternatives, std::cout );
-		)
-		AltList::iterator oldBegin = alternatives.begin();
+			)
+			AltList::iterator oldBegin = alternatives.begin();
 		pruneAlternatives( alternatives.begin(), alternatives.end(), front_inserter( alternatives ), indexer );
 		if ( alternatives.begin() == oldBegin ) {
-			std::ostringstream stream;
+			std::ostrstream stream;
 			stream << "Can't choose between alternatives for expression ";
 			expr->print( stream );
@@ -216,11 +216,11 @@
 			findMinCost( alternatives.begin(), alternatives.end(), back_inserter( winners ) );
 			printAlts( winners, stream, 8 );
-			throw SemanticError( stream.str() );
+			throw SemanticError( std::string( stream.str(), stream.pcount() ) );
 		}
 		alternatives.erase( oldBegin, alternatives.end() );
 		PRINT(
 			std::cout << "there are " << alternatives.size() << " alternatives after elimination" << std::endl;
-		)
-	}
+			)
+			}
 
 	void AlternativeFinder::findWithAdjustment( Expression *expr ) {
@@ -264,6 +264,6 @@
 				std::cout << "--- results are" << std::endl;
 				printAll( (*actualExpr)->get_results(), std::cout, 8 );
-			)
-			std::list< DeclarationWithType* >::iterator startFormal = formal;
+				)
+				std::list< DeclarationWithType* >::iterator startFormal = formal;
 			Cost actualCost;
 			for ( std::list< Type* >::iterator actual = (*actualExpr)->get_results().begin(); actual != (*actualExpr)->get_results().end(); ++actual ) {
@@ -281,13 +281,13 @@
 					std::cout << std::endl << " to ";
 					(*formal)->get_type()->print( std::cout, 8 );
-				)
-				Cost newCost = conversionCost( *actual, (*formal)->get_type(), indexer, alt.env );
+					)
+					Cost newCost = conversionCost( *actual, (*formal)->get_type(), indexer, alt.env );
 				PRINT(
 					std::cout << std::endl << "cost is" << newCost << std::endl;
-				)
-
-				if ( newCost == Cost::infinity ) {
-					return newCost;
-				}
+					)
+
+					if ( newCost == Cost::infinity ) {
+						return newCost;
+					}
 				convCost += newCost;
 				actualCost += newCost;
@@ -381,8 +381,8 @@
 					(*actual)->print( std::cerr );
 					std::cerr << std::endl;
-				)
-				if ( ! unify( (*formal)->get_type(), *actual, resultEnv, resultNeed, resultHave, openVars, indexer ) ) {
-					return false;
-				}
+					)
+					if ( ! unify( (*formal)->get_type(), *actual, resultEnv, resultNeed, resultHave, openVars, indexer ) ) {
+						return false;
+					}
 				formal++;
 			}
@@ -429,6 +429,6 @@
 					std::cerr << "recursing with new set:" << std::endl;
 					printAssertionSet( newNeed, std::cerr, 8 );
-				)
-				inferRecursive( newNeed.begin(), newNeed.end(), newAlt, openVars, decls, newerNeed, level+1, indexer, out );
+					)
+					inferRecursive( newNeed.begin(), newNeed.end(), newAlt, openVars, decls, newerNeed, level+1, indexer, out );
 				return;
 			}
@@ -444,6 +444,6 @@
 			curDecl->print( std::cerr );
 			std::cerr << std::endl;
-		)
-		std::list< DeclarationWithType* > candidates;
+			)
+			std::list< DeclarationWithType* > candidates;
 		decls.lookupId( curDecl->get_name(), candidates );
 ///   if ( candidates.empty() ) { std::cout << "no candidates!" << std::endl; }
@@ -453,6 +453,6 @@
 				(*candidate)->print( std::cout );
 				std::cout << std::endl;
-			)
-			AssertionSet newHave, newerNeed( newNeed );
+				)
+				AssertionSet newHave, newerNeed( newNeed );
 			TypeEnvironment newEnv( newAlt.env );
 			OpenVarSet newOpenVars( openVars );
@@ -466,32 +466,32 @@
 				adjType->print( std::cerr );
 				std::cerr << std::endl;
-			)
-			if ( unify( curDecl->get_type(), adjType, newEnv, newerNeed, newHave, newOpenVars, indexer ) ) {
-				PRINT(
-					std::cerr << "success!" << std::endl;
 				)
-				SymTab::Indexer newDecls( decls );
-				addToIndexer( newHave, newDecls );
-				Alternative newerAlt( newAlt );
-				newerAlt.env = newEnv;
-				assert( (*candidate)->get_uniqueId() );
-				Expression *varExpr = new VariableExpr( static_cast< DeclarationWithType* >( Declaration::declFromId( (*candidate)->get_uniqueId() ) ) );
-				deleteAll( varExpr->get_results() );
-				varExpr->get_results().clear();
-				varExpr->get_results().push_front( adjType->clone() );
-				PRINT(
-					std::cout << "satisfying assertion " << curDecl->get_uniqueId() << " ";
-					curDecl->print( std::cout );
-					std::cout << " with declaration " << (*candidate)->get_uniqueId() << " ";
-					(*candidate)->print( std::cout );
-					std::cout << std::endl;
-				)
-				ApplicationExpr *appExpr = static_cast< ApplicationExpr* >( newerAlt.expr );
-				// XXX: this is a memory leak, but adjType can't be deleted because it might contain assertions
-				appExpr->get_inferParams()[ curDecl->get_uniqueId() ] = ParamEntry( (*candidate)->get_uniqueId(), adjType->clone(), curDecl->get_type()->clone(), varExpr );
-				inferRecursive( begin, end, newerAlt, newOpenVars, newDecls, newerNeed, level, indexer, out );
-			} else {
-				delete adjType;
-			}
+				if ( unify( curDecl->get_type(), adjType, newEnv, newerNeed, newHave, newOpenVars, indexer ) ) {
+					PRINT(
+						std::cerr << "success!" << std::endl;
+						)
+						SymTab::Indexer newDecls( decls );
+					addToIndexer( newHave, newDecls );
+					Alternative newerAlt( newAlt );
+					newerAlt.env = newEnv;
+					assert( (*candidate)->get_uniqueId() );
+					Expression *varExpr = new VariableExpr( static_cast< DeclarationWithType* >( Declaration::declFromId( (*candidate)->get_uniqueId() ) ) );
+					deleteAll( varExpr->get_results() );
+					varExpr->get_results().clear();
+					varExpr->get_results().push_front( adjType->clone() );
+					PRINT(
+						std::cout << "satisfying assertion " << curDecl->get_uniqueId() << " ";
+						curDecl->print( std::cout );
+						std::cout << " with declaration " << (*candidate)->get_uniqueId() << " ";
+						(*candidate)->print( std::cout );
+						std::cout << std::endl;
+						)
+						ApplicationExpr *appExpr = static_cast< ApplicationExpr* >( newerAlt.expr );
+					// XXX: this is a memory leak, but adjType can't be deleted because it might contain assertions
+					appExpr->get_inferParams()[ curDecl->get_uniqueId() ] = ParamEntry( (*candidate)->get_uniqueId(), adjType->clone(), curDecl->get_type()->clone(), varExpr );
+					inferRecursive( begin, end, newerAlt, newOpenVars, newDecls, newerNeed, level, indexer, out );
+				} else {
+					delete adjType;
+				}
 		}
 	}
@@ -509,6 +509,6 @@
 			std::cout << "============= new indexer" << std::endl;
 			decls.print( std::cout );
-		)
-		addToIndexer( have, decls );
+			)
+			addToIndexer( have, decls );
 		AssertionSet newNeed;
 		inferRecursive( need.begin(), need.end(), newAlt, openVars, decls, newNeed, 0, indexer, out );
@@ -533,6 +533,6 @@
 				std::cout << "need assertions:" << std::endl;
 				printAssertionSet( resultNeed, std::cout, 8 );
-			)
-			inferParameters( resultNeed, resultHave, newAlt, openVars, out );
+				)
+				inferParameters( resultNeed, resultHave, newAlt, openVars, out );
 		}
 	}
@@ -545,6 +545,6 @@
 			NameExpr *fname;
 			if ( ( fname = dynamic_cast<NameExpr *>( untypedExpr->get_function()))
-				 && ( fname->get_name() == std::string("&&")) ) {
-				alternatives.push_back( Alternative( untypedExpr->clone(), env, Cost()) );
+				 && ( fname->get_name() == std::string("LabAddress")) ) {
+				alternatives.push_back( Alternative( untypedExpr, env, Cost()) );
 				return;
 			}
@@ -570,7 +570,7 @@
 				std::cout << "working on alternative: " << std::endl;
 				func->print( std::cout, 8 );
-			)
-			// check if the type is pointer to function
-			PointerType *pointer;
+				)
+				// check if the type is pointer to function
+				PointerType *pointer;
 			if ( func->expr->get_results().size() == 1 && ( pointer = dynamic_cast< PointerType* >( func->expr->get_results().front() ) ) ) {
 				if ( FunctionType *function = dynamic_cast< FunctionType* >( pointer->get_base() ) ) {
@@ -603,6 +603,6 @@
 						std::cout << "known function ops:" << std::endl;
 						printAlts( funcOpFinder.alternatives, std::cout, 8 );
-					)
-				}
+						)
+						}
 
 				for ( AltList::const_iterator funcOp = funcOpFinder.alternatives.begin(); funcOp != funcOpFinder.alternatives.end(); ++funcOp ) {
@@ -642,9 +642,9 @@
 				withFunc->env.print( std::cout, 8 );
 				std::cout << "cost of conversion is:" << cvtCost << std::endl;
-			)
-			if ( cvtCost != Cost::infinity ) {
-				withFunc->cvtCost = cvtCost;
-				alternatives.push_back( *withFunc );
-			} // if
+				)
+				if ( cvtCost != Cost::infinity ) {
+					withFunc->cvtCost = cvtCost;
+					alternatives.push_back( *withFunc );
+				} // if
 		} // for
 		candidates.clear();
@@ -737,22 +737,22 @@
 		indexer.lookupId( nameExpr->get_name(), declList );
 		PRINT( std::cerr << "nameExpr is " << nameExpr->get_name() << std::endl; )
-		for ( std::list< DeclarationWithType* >::iterator i = declList.begin(); i != declList.end(); ++i ) {
-			VariableExpr newExpr( *i, nameExpr->get_argName() );
-			alternatives.push_back( Alternative( newExpr.clone(), env, Cost() ) );
-			PRINT(
-				std::cerr << "decl is ";
-				(*i)->print( std::cerr );
-				std::cerr << std::endl;
-				std::cerr << "newExpr is ";
-				newExpr.print( std::cerr );
-				std::cerr << std::endl;
-			)
-			renameTypes( alternatives.back().expr );
-			if ( StructInstType *structInst = dynamic_cast< StructInstType* >( (*i)->get_type() ) ) {
-				addAggMembers( structInst, &newExpr, Cost( 0, 0, 1 ), "" );
-			} else if ( UnionInstType *unionInst = dynamic_cast< UnionInstType* >( (*i)->get_type() ) ) {
-				addAggMembers( unionInst, &newExpr, Cost( 0, 0, 1 ), "" );
-			} // if
-		} // for
+			for ( std::list< DeclarationWithType* >::iterator i = declList.begin(); i != declList.end(); ++i ) {
+				VariableExpr newExpr( *i, nameExpr->get_argName() );
+				alternatives.push_back( Alternative( newExpr.clone(), env, Cost() ) );
+				PRINT(
+					std::cerr << "decl is ";
+					(*i)->print( std::cerr );
+					std::cerr << std::endl;
+					std::cerr << "newExpr is ";
+					newExpr.print( std::cerr );
+					std::cerr << std::endl;
+					)
+					renameTypes( alternatives.back().expr );
+				if ( StructInstType *structInst = dynamic_cast< StructInstType* >( (*i)->get_type() ) ) {
+					addAggMembers( structInst, &newExpr, Cost( 0, 0, 1 ), "" );
+				} else if ( UnionInstType *unionInst = dynamic_cast< UnionInstType* >( (*i)->get_type() ) ) {
+					addAggMembers( unionInst, &newExpr, Cost( 0, 0, 1 ), "" );
+				} // if
+			} // for
 	}
 
@@ -794,11 +794,11 @@
 			argType->print( std::cout );
 			std::cout << std::endl;
-		)
-		if ( typesCompatibleIgnoreQualifiers( argType, function->get_parameters().front()->get_type(), indexer, env ) ) {
-			alternatives.push_back( Alternative( new AttrExpr( new VariableExpr( funcDecl ), argType->clone() ), env, Cost::zero ) );
-			for ( std::list< DeclarationWithType* >::iterator i = function->get_returnVals().begin(); i != function->get_returnVals().end(); ++i ) {
-				alternatives.back().expr->get_results().push_back( (*i)->get_type()->clone() );
-			} // for
-		} // if
+			)
+			if ( typesCompatibleIgnoreQualifiers( argType, function->get_parameters().front()->get_type(), indexer, env ) ) {
+				alternatives.push_back( Alternative( new AttrExpr( new VariableExpr( funcDecl ), argType->clone() ), env, Cost::zero ) );
+				for ( std::list< DeclarationWithType* >::iterator i = function->get_returnVals().begin(); i != function->get_returnVals().end(); ++i ) {
+					alternatives.back().expr->get_results().push_back( (*i)->get_type()->clone() );
+				} // for
+			} // if
 	}
 
Index: src/ResolvExpr/RenameVars.cc
===================================================================
--- src/ResolvExpr/RenameVars.cc	(revision 721f17ac6221a75230b4b1228917e6a163b53ff6)
+++ src/ResolvExpr/RenameVars.cc	(revision 09d789c493c816483fb88c49a900967b7addbd2c)
@@ -10,9 +10,9 @@
 // Created On       : Sun May 17 12:05:18 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jun  8 14:51:35 2015
-// Update Count     : 4
+// Last Modified On : Sun May 17 12:07:59 2015
+// Update Count     : 2
 //
 
-#include <sstream>
+#include <strstream>
 
 #include "RenameVars.h"
@@ -120,7 +120,7 @@
 			mapStack.push_front( mapStack.front() );
 			for ( std::list< TypeDecl* >::iterator i = type->get_forall().begin(); i != type->get_forall().end(); ++i ) {
-				std::ostringstream output;
+				std::ostrstream output;
 				output << "_" << level << "_" << (*i)->get_name();
-				std::string newname( output.str() );
+				std::string newname( output.str(), output.pcount() );
 				mapStack.front()[ (*i)->get_name() ] = newname;
 				(*i)->set_name( newname );
Index: src/ResolvExpr/Resolver.cc
===================================================================
--- src/ResolvExpr/Resolver.cc	(revision 721f17ac6221a75230b4b1228917e6a163b53ff6)
+++ src/ResolvExpr/Resolver.cc	(revision 09d789c493c816483fb88c49a900967b7addbd2c)
@@ -9,7 +9,7 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 12:17:01 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Wed Jun 24 16:20:35 2015
-// Update Count     : 156
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sun May 17 12:18:17 2015
+// Update Count     : 2
 //
 
@@ -38,6 +38,4 @@
 		virtual void visit( TypeDecl *typeDecl );
 
-		virtual void visit( ArrayType * at );
-
 		virtual void visit( ExprStmt *exprStmt );
 		virtual void visit( IfStmt *ifStmt );
@@ -47,5 +45,4 @@
 		virtual void visit( ChooseStmt *switchStmt );
 		virtual void visit( CaseStmt *caseStmt );
-		virtual void visit( BranchStmt *branchStmt );
 		virtual void visit( ReturnStmt *returnStmt );
 
@@ -53,9 +50,4 @@
 		virtual void visit( ListInit *listInit );
 	  private:
-  	typedef std::list< Initializer * >::iterator InitIterator;
-
-	  void resolveAggrInit( AggregateDecl *, InitIterator &, InitIterator & );
-	  void resolveSingleAggrInit( Declaration *, InitIterator &, InitIterator & );
-
 		std::list< Type * > functionReturn;
 		Type *initContext;
@@ -166,16 +158,5 @@
 		SymTab::Indexer::visit( objectDecl );
 	}
-
-	void Resolver::visit( ArrayType * at ) {
-		if ( at->get_dimension() ) {
-			BasicType arrayLenType = BasicType( Type::Qualifiers(), BasicType::LongUnsignedInt );
-			CastExpr *castExpr = new CastExpr( at->get_dimension(), arrayLenType.clone() );
-			Expression *newExpr = findSingleExpression( castExpr, *this );
-			delete at->get_dimension();
-			at->set_dimension( newExpr );
-		}
-		Visitor::visit( at );
-	}
-
+  
 	void Resolver::visit( TypeDecl *typeDecl ) {
 		if ( typeDecl->get_base() ) {
@@ -185,5 +166,5 @@
 		SymTab::Indexer::visit( typeDecl );
 	}
-
+  
 	void Resolver::visit( FunctionDecl *functionDecl ) {
 #if 0
@@ -271,17 +252,4 @@
 	}
 
-	void Resolver::visit( BranchStmt *branchStmt ) {
-		// must resolve the argument for a computed goto
-		if ( branchStmt->get_type() == BranchStmt::Goto ) { // check for computed goto statement
-			if ( NameExpr * arg = dynamic_cast< NameExpr * >( branchStmt->get_computedTarget() ) ) {
-				VoidType v = Type::Qualifiers();		// cast to void * for the alternative finder
-				PointerType pt( Type::Qualifiers(), v.clone() );
-				CastExpr * castExpr = new CastExpr( arg, pt.clone() );
-				Expression * newExpr = findSingleExpression( castExpr, *this ); // find best expression
-				branchStmt->set_target( newExpr );
-			} // if
-		} // if
-	}
-
 	void Resolver::visit( ReturnStmt *returnStmt ) {
 		if ( returnStmt->get_expr() ) {
@@ -292,13 +260,4 @@
 			returnStmt->set_expr( newExpr );
 		} // if
-	}
-
-	template< typename T >
-	bool isCharType( T t ) {
-		if ( BasicType * bt = dynamic_cast< BasicType * >( t ) ) {
-			return bt->get_kind() == BasicType::Char || bt->get_kind() == BasicType::SignedChar || 
-				bt->get_kind() == BasicType::UnsignedChar;
-		}
-		return false;
 	}
 
@@ -327,81 +286,10 @@
 			delete castExpr;
 			singleInit->set_value( newExpr );
-
-			// check if initializing type is char[]
-			if ( ArrayType * at = dynamic_cast< ArrayType * >( initContext ) ) {
-				if ( isCharType( at->get_base() ) ) {
-					// check if the resolved type is char *
-					if ( PointerType * pt = dynamic_cast< PointerType *>( newExpr->get_results().front() ) ) {
-						if ( isCharType( pt->get_base() ) ) {
-							// strip cast if we're initializing a char[] with a char *, e.g.
-							// char x[] = "hello";
-							CastExpr *ce = dynamic_cast< CastExpr * >( newExpr );
-							singleInit->set_value( ce->get_arg() );
-							ce->set_arg( NULL );
-							delete ce;									
-						}
-					}
-				}
-			}
 		} // if
 //	singleInit->get_value()->accept( *this );
 	}
 
-	void Resolver::resolveSingleAggrInit( Declaration * dcl, InitIterator & init, InitIterator & initEnd ) {
-		DeclarationWithType * dt = dynamic_cast< DeclarationWithType * >( dcl );
-		assert( dt );
-		initContext = dt->get_type();
-		try {
-			if ( init == initEnd ) return; // stop when there are no more initializers
-			(*init)->accept( *this );
-			++init; // made it past an initializer
-		} catch( SemanticError & ) {
-			// need to delve deeper, if you can
-			if ( StructInstType * sit = dynamic_cast< StructInstType * >( dt->get_type() ) ) {
-				resolveAggrInit( sit->get_baseStruct(), init, initEnd );
-			} else if ( UnionInstType * uit = dynamic_cast< UnionInstType * >( dt->get_type() ) ) {
-				resolveAggrInit( uit->get_baseUnion(), init, initEnd );
-			} else {
-				// member is not an aggregate type, so can't go any deeper
-
-				// might need to rethink what is being thrown
-				throw;
-			} // if
-		}
-	}
-
-	void Resolver::resolveAggrInit( AggregateDecl * aggr, InitIterator & init, InitIterator & initEnd ) {
-		if ( StructDecl * st = dynamic_cast< StructDecl * >( aggr ) ) {
-			// want to resolve each initializer to the members of the struct,
-			// but if there are more initializers than members we should stop
-			list< Declaration * >::iterator it = st->get_members().begin();
-			for ( ; it != st->get_members().end(); ++it) {
-				resolveSingleAggrInit( *it, init, initEnd );
-			}
-		} else if ( UnionDecl * un = dynamic_cast< UnionDecl * >( aggr ) ) {
-			// only resolve to the first member of a union
-			resolveSingleAggrInit( *un->get_members().begin(), init, initEnd );
-		} // if
-	}
-
-	void Resolver::visit( ListInit * listInit ) {
-		InitIterator iter = listInit->begin_initializers();
-		InitIterator end = listInit->end_initializers();
-
-		if ( ArrayType * at = dynamic_cast< ArrayType * >( initContext ) ) {
-			// resolve each member to the base type of the array
-			for ( ; iter != end; ++iter ) {
-				initContext = at->get_base();
-				(*iter)->accept( *this );
-			} // for
-		} else if ( StructInstType * st = dynamic_cast< StructInstType * >( initContext ) ) {
-			resolveAggrInit( st->get_baseStruct(), iter, end );
-		} else if ( UnionInstType *st = dynamic_cast< UnionInstType * >( initContext ) ) {
-			resolveAggrInit( st->get_baseUnion(), iter, end );
-		} else {
-			// basic types are handled here
-			Visitor::visit( listInit );
-		}
-
+	void Resolver::visit( ListInit *listInit ) {
+		Visitor::visit(listInit);
 #if 0
 		if ( ArrayType *at = dynamic_cast<ArrayType*>(initContext) ) {
Index: src/ResolvExpr/Unify.cc
===================================================================
--- src/ResolvExpr/Unify.cc	(revision 721f17ac6221a75230b4b1228917e6a163b53ff6)
+++ src/ResolvExpr/Unify.cc	(revision 09d789c493c816483fb88c49a900967b7addbd2c)
@@ -10,6 +10,6 @@
 // Created On       : Sun May 17 12:27:10 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jun 26 14:57:05 2015
-// Update Count     : 7
+// Last Modified On : Sun May 17 13:08:48 2015
+// Update Count     : 6
 //
 
@@ -149,5 +149,4 @@
 				Type *common = 0;
 				std::auto_ptr< Type > newType( curClass.type->clone() );
-				newType->get_qualifiers() = typeInst->get_qualifiers();
 				if ( unifyInexact( newType.get(), other, env, needAssertions, haveAssertions, openVars, widenMode & WidenMode( curClass.allowWidening, true ), indexer, common ) ) {
 					if ( common ) {
Index: src/ResolvExpr/module.mk
===================================================================
--- src/ResolvExpr/module.mk	(revision 721f17ac6221a75230b4b1228917e6a163b53ff6)
+++ src/ResolvExpr/module.mk	(revision 09d789c493c816483fb88c49a900967b7addbd2c)
@@ -1,20 +1,4 @@
-######################### -*- Mode: Makefile-Gmake -*- ########################
-##
-## Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo
-##
-## The contents of this file are covered under the licence agreement in the
-## file "LICENCE" distributed with Cforall.
-##
-## module.mk -- 
-##
-## Author           : Richard C. Bilson
-## Created On       : Mon Jun  1 17:49:17 2015
-## Last Modified By : Peter A. Buhr
-## Last Modified On : Mon Jun  1 17:53:28 2015
-## Update Count     : 1
-###############################################################################
-
 SRC += ResolvExpr/AlternativeFinder.cc \
-       ResolvExpr/Alternative.cc \
+      ResolvExpr/Alternative.cc \
        ResolvExpr/Unify.cc \
        ResolvExpr/PtrsAssignable.cc \
@@ -32,2 +16,3 @@
        ResolvExpr/Occurs.cc \
        ResolvExpr/TypeEnvironment.cc
+