Fix pairing sorting to ensure byes are last.