Unify sort callbacks

[TimWolla]

Use <=> where possible. Affected locations can somewhat easily be found by searching for return -1 which is fairly specific for this type of callback.