Index: src/ResolvExpr/CandidateFinder.cpp
===================================================================
--- src/ResolvExpr/CandidateFinder.cpp	(revision de57af9e217ccb4f8e44b5ca36bdf77c6f0fdc58)
+++ src/ResolvExpr/CandidateFinder.cpp	(revision b7763da866f0d48a384a1805161d3cbe100a2e7e)
@@ -597,5 +597,5 @@
 		const ast::SymbolTable & symtab;
 	public:
-		static size_t traceId;
+		// static size_t traceId;
 		CandidateFinder & selfFinder;
 		CandidateList & candidates;
@@ -890,5 +890,5 @@
 							}
 						}
-						
+
 						// if argType is an unbound type parameter, all special functions need to be searched.
 						if (isUnboundType(argType)) {
@@ -1104,5 +1104,5 @@
 				// unification run for side-effects
 				unify( toType, cand->expr->result, cand->env, need, have, open, symtab );
-				Cost thisCost = 
+				Cost thisCost =
 					(castExpr->isGenerated == ast::GeneratedFlag::GeneratedCast)
  	                    ? conversionCost( cand->expr->result, toType, cand->expr->get_lvalue(), symtab, cand->env )
@@ -1729,10 +1729,10 @@
 						found->second.ambiguous = true;
 					}
-				} else { 
+				} else {
 					// xxx - can satisfyAssertions increase the cost?
 					PRINT(
 						std::cerr << "cost " << newCand->cost << " loses to "
 							<< found->second.candidate->cost << std::endl;
-					)	
+					)
 				}
 			} else {
@@ -1819,5 +1819,5 @@
 		if ( mode.failFast && pruned.empty() ) {
 			std::ostringstream stream;
-			if (found) {		
+			if (found) {
 				CandidateList winners = findMinCost( candidates );
 				stream << "Cannot choose between " << winners.size() << " alternatives for "
Index: src/ResolvExpr/Unify.cc
===================================================================
--- src/ResolvExpr/Unify.cc	(revision de57af9e217ccb4f8e44b5ca36bdf77c6f0fdc58)
+++ src/ResolvExpr/Unify.cc	(revision b7763da866f0d48a384a1805161d3cbe100a2e7e)
@@ -1044,5 +1044,5 @@
 			}
 
-			return { new ast::TupleType{ std::move(out) } };
+			return new ast::TupleType{ std::move(out) };
 		}