Index: src/ResolvExpr/RenameVars.h
===================================================================
--- src/ResolvExpr/RenameVars.h	(revision 3caf5e37ee553cf8f3b0cae6d46bb65b3d8293fa)
+++ src/ResolvExpr/RenameVars.h	(revision 94fa946772b2fa421846c18271470c2b58b3a387)
@@ -36,10 +36,7 @@
 	};
 	const ast::Type * renameTyVars( const ast::Type *, RenameMode mode = GEN_USAGE, bool reset = true );
-	
 
 	/// resets internal state of renamer to avoid overflow
 	void resetTyVarRenaming();
-
-	
 } // namespace ResolvExpr
 
Index: src/ResolvExpr/ResolveTypeof.cc
===================================================================
--- src/ResolvExpr/ResolveTypeof.cc	(revision 3caf5e37ee553cf8f3b0cae6d46bb65b3d8293fa)
+++ src/ResolvExpr/ResolveTypeof.cc	(revision 94fa946772b2fa421846c18271470c2b58b3a387)
@@ -169,5 +169,4 @@
 
 struct FixArrayDimension {
-	// should not require a mutable symbol table - prevent pass template instantiation
 	const ResolveContext & context;
 	FixArrayDimension(const ResolveContext & context) : context( context ) {}
@@ -196,35 +195,23 @@
 
 const ast::ObjectDecl * fixObjectType( const ast::ObjectDecl * decl , const ResolveContext & context ) {
-	if (!decl->isTypeFixed) {
-		auto mutDecl = mutate(decl);
+	if (decl->isTypeFixed) {
+		return decl;
+	}
+
+	auto mutDecl = mutate(decl);
+	{
 		auto resolvedType = resolveTypeof(decl->type, context);
 		resolvedType = fixArrayType(resolvedType, context);
 		mutDecl->type = resolvedType;
-
-		// check variable length if object is an array.
-		// xxx - should this be part of fixObjectType?
-
-		/*
-		if (auto arrayType = dynamic_cast<const ast::ArrayType *>(resolvedType)) {
-			auto dimExpr = findSingleExpression(arrayType->dimension, ast::sizeType, symtab);
-			if (auto varexpr = arrayType->dimension.as<ast::VariableExpr>()) {// hoisted previously
-				if (InitTweak::isConstExpr(varexpr->var.strict_as<ast::ObjectDecl>()->init)) {
-					auto mutType = mutate(arrayType);
-					mutType->isVarLen = ast::LengthFlag::VariableLen;
-					mutDecl->type = mutType;
-				}
-			}
-		}
-		*/
-
-
-		if (!mutDecl->name.empty()) 
-			mutDecl->mangleName = Mangle::mangle(mutDecl); // do not mangle unnamed variables
-		
-		mutDecl->type = renameTyVars(mutDecl->type, RenameMode::GEN_EXPR_ID);
-		mutDecl->isTypeFixed = true;
-		return mutDecl;
-	}
-	return decl;
+	}
+
+	// Do not mangle unnamed variables.
+	if (!mutDecl->name.empty()) {
+		mutDecl->mangleName = Mangle::mangle(mutDecl);
+	}
+
+	mutDecl->type = renameTyVars(mutDecl->type, RenameMode::GEN_EXPR_ID);
+	mutDecl->isTypeFixed = true;
+	return mutDecl;
 }
 
Index: src/ResolvExpr/ResolveTypeof.h
===================================================================
--- src/ResolvExpr/ResolveTypeof.h	(revision 3caf5e37ee553cf8f3b0cae6d46bb65b3d8293fa)
+++ src/ResolvExpr/ResolveTypeof.h	(revision 94fa946772b2fa421846c18271470c2b58b3a387)
@@ -5,5 +5,5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// ResolveTypeof.h -- 
+// ResolveTypeof.h --
 //
 // Author           : Richard C. Bilson