Back to using ORDER type for sorting

Keeps it cleaner, I think.