Fix build failure with MSVC, following r208680