Cleaning up the enums a bit (breaking them apart for clarity).