Fix code that breaks with VC (terrible compiler)

VC2013 still does not properly support placement of variables anywhere
in the scope.  It's a garbage compiler, always will be a garbage
compiler.