"Put all <keywords, tfields> pairs into alphabetical order" is wrong in Appendix A of UTS35

In http://unicode.org/reports/tr35/#LocaleId_Canonicalization
we have

• Put all <keywords, tfields> pairs into alphabetical order of their keys, within their respective extensions.

The spec makes it seem keywords and tfields are a pair of data, but that is not true.
In the current version of UTS35 grammar, there are no <keywords, tfields> pairs.we have
"keyword = key (sep type)? ;"So there are "<key, type> pairs"We also have "tfield = tkey tvalue;"so there are "<tkey, tvalue> pairs"

Should we change UTS35 to as 

• Put all <keywords, tfields> pairs into alphabetical order of their keys, within their respective extensions.
  + Put all keywords(<key, type>) and tfields (<tkey, tvalue>) pairs into alphabetical order of their keys (or tkeys), within their respective extensions.