Made MSVC workaround specific to MSVC in order to avoid a GCC 4.8 bug.