[SCSI] Re-do "final klist fixes"