Workarounds for VC12 bugs

MSVC2013 should support this part of C99, but it fails in the
corner case where the declaration is directly after an if statement
without braces.