Make two more changes to the ata request queue sorting code.