Wow, ok. Hmm. Seems like I originally intended to include the sort columns, and then in a later commit, omitted them as cruft, not realizing that this reduced it back to this much simpler form. I don't see any problems so I guess if the tests pass...!