Avoid misinheritance of client.
Add an index.
Put some newApi, newKey, newKeyring type helpers on the client object.