Clean up some code in the server-key Keyring.