Make it work with latest Rust again
Use prefixed enums