agent: squash some more common keyring semantics