Tweak a few things around KeychainClient; it works now!