Index: src/ResolvExpr/Resolver.cc
===================================================================
--- src/ResolvExpr/Resolver.cc	(revision 2fb35df396c012cc3908fbb4d946ba80cad0ce88)
+++ src/ResolvExpr/Resolver.cc	(revision e7d6968ca3b4455b39947466f58154fce3451c5c)
@@ -1105,5 +1105,7 @@
 		}
 
-		/// Establish post-resolver invariants for expressions
+		
+	} // anonymous namespace
+/// Establish post-resolver invariants for expressions
 		void finishExpr(
 			ast::ptr< ast::Expr > & expr, const ast::TypeEnvironment & env,
@@ -1118,6 +1120,4 @@
 			StripCasts_new::strip( expr );
 		}
-	} // anonymous namespace
-
 
 	ast::ptr< ast::Expr > resolveInVoidContext(
@@ -1139,6 +1139,5 @@
 	}
 
-	namespace {
-		/// Resolve `untyped` to the expression whose candidate is the best match for a `void`
+	/// Resolve `untyped` to the expression whose candidate is the best match for a `void`
 		/// context.
 		ast::ptr< ast::Expr > findVoidExpression(
@@ -1151,4 +1150,7 @@
 			return newExpr;
 		}
+
+	namespace {
+		
 
 		/// resolve `untyped` to the expression whose candidate satisfies `pred` with the
@@ -1162,5 +1164,5 @@
 			CandidateRef choice =
 				findUnfinishedKindExpression( untyped, symtab, kind, pred, mode );
-			finishExpr( choice->expr, choice->env, untyped->env );
+			ResolvExpr::finishExpr( choice->expr, choice->env, untyped->env );
 			return std::move( choice->expr );
 		}
Index: src/ResolvExpr/Resolver.h
===================================================================
--- src/ResolvExpr/Resolver.h	(revision 2fb35df396c012cc3908fbb4d946ba80cad0ce88)
+++ src/ResolvExpr/Resolver.h	(revision e7d6968ca3b4455b39947466f58154fce3451c5c)
@@ -66,4 +66,6 @@
 	ast::ptr< ast::Expr > findSingleExpression(
 		const ast::Expr * untyped, const ast::Type * type, const ast::SymbolTable & symtab );
+	ast::ptr< ast::Expr > findVoidExpression(
+		const ast::Expr * untyped, const ast::SymbolTable & symtab);
 	/// Resolves a constructor init expression
 	ast::ptr< ast::Init > resolveCtorInit(