Some slight changes to make it easier to keep the GCC and MSVC builds in sync.