I think we can create a new enum, deprecate the old one, and use `Into` generics to make this a non-breaking change for most users.