Touch-up: Sort the enums (tokens) in a stable manner for consistency in include files.