Fix MSVC build, take 2.