Modify some initialization slightly to keep MSVC happy