Fix MSVC build, take 3.