Taking an opportunity to re-organize enums --kazu