fixup handling of gkr and ssh-agent.