Applied windows build fixes from 46df635

This particular line would crash the MSVC CL compiler, so... yeah, that could be considered not supported.