Fix some incorrect MSVC #ifdef's. Fixes #1305