Fix scoping errors VC++ accepts but GCC doesn't.