Bug 23427: Simplify sort logic