Now MSVC is happy again, too