Sort order-insensitive things to cut down on diffs when regenerating files
Sort enum values
Handle xsd:choice directly within xsd:sequence