Another try at making MSVC happy again.