Proposal: `Enum` class overhaul