Sort __default__ out without trusting the Z

Not a major change, I just found a couple cases where I wanted something to appear at the end of the list and the `'zzzzz'` made me sleepy. Sorting by the actual order, although adding a tiny bit more logic, felt a bit cleaner.