01b67f4b26
Switching to `Ordering::then_with` makes control-flow less complicated, and there is no need to use `partial_cmp` here.