Correct bug in order-by-comparers
Simplify order-by