This is wasted space if the const is just an enum, but optimizing that case without breaking everything else is an issue that can be addressed separately.