Move more married keychain functionality into DeterministicKeyChain