Remove some more constexpr because of clang