More changes from Chris; tweak to work with new sshKeydist code.