Cleanup: VS2013 problematic variable declarations from recent changes

Works around a parsing problem in VS2013 where a variable cannot be declared after an if() with no braces on its body by adding braces to some recent code changes.