Code cleanup in Keychain and Language