Merge pull request #8056 from JosJuice/more-enums-to-constexpr Turn more enum constants into constexpr
