Merge pull request #8035 from jordan-woyak/si-enum-constexpr SI: Replace some unnamed enums with constexpr.
