More gcc fixes of Visual Studio workarounds.