Fix sorting after r308293, using the ../tools/do_sort script.
Is this a pointy-hat offense?
Reported by: jhb