Now that we have a 'slot' variable, make better use of it to simplify
some code a little.
Signed-off-by: NNeilBrown <neilb@suse.de>