I kind of feel like these --keyring options should be their own patch/pull request.