VS16.10 fixes the regression and bumps up _MSC_VER, so make only VS2017 and VS16.9 use the workaround