Given up hope of compiling MSVC 2013, so I'm removing the macros.