Workaround msvc constexpr issues
3 files changed