Moved from enums to plain old ints.