Extended the optimizer workaround to all MSVC versions.