feature_collection_grammar: make argument order consistent across parsing rules - #2582