Remove most of the .order('{it -> ...}') calls.

Most of these .order('{it -> ...}') calls are no longer necessary.
This commit probably removes some that ARE still necessary, so
I'll likely need a few more commits to get this right.