Add more workarounds in terms of defines for VS.