Further removal of MSVC-only code