Make enums more idiomatic