Move the icky call to step() from iscsi.c to scsi.c; this takes it at least one step further away from where it really doesn't belong.