Small improvements

* Update result dictionary keys
* Unify keychain item deletion code
* Don't delete keychain items when saving; update if possible