#
#
# patch "cmd_key_cert.cc"
#  from [3358391c50f44b96815b3981addfba205010dc3c]
#    to [a411628241629ecb7dcfbc490502701b62a63321]
# 
# patch "cmd_packet.cc"
#  from [55ab79f2785e82c2c949dac98deb2ed5bedce715]
#    to [c40a801e198267ed71bd9f248e56068833c26c6e]
# 
# patch "lua_hooks.cc"
#  from [01bab6def621315198c957c066e3485417ffafc7]
#    to [0e452916d1f1fda856829a1f8887fc8f25d12e05]
# 
# patch "project.cc"
#  from [7f09669ff03f52d03219582eb0885e66fee42c57]
#    to [da20b004d233b9bdace2efa9bcaaa9e861bd3e87]
# 
# patch "project.hh"
#  from [a2f4dd3608d0bb80168a5aa41cef110a3f0c3af9]
#    to [a156012f665b7608020320598c08541ee340cd3c]
#
============================================================
--- cmd_key_cert.cc	3358391c50f44b96815b3981addfba205010dc3c
+++ cmd_key_cert.cc	a411628241629ecb7dcfbc490502701b62a63321
@@ -72,7 +72,9 @@ CMD(dropkey, "dropkey", "", CMD_REF(key_
 
   key_identity_info identity;
   project_t project(db);
-  project.get_key_identity(keys, app.lua, idx(args, 0), identity);
+  project.get_key_identity(keys, app.lua,
+                           typecast_vocab<external_key_name>(idx(args, 0)),
+                           identity);
 
   if (db.database_specified())
     {
@@ -117,7 +119,9 @@ CMD(passphrase, "passphrase", "", CMD_RE
   project_t project(db);
   key_identity_info identity;
 
-  project.get_key_identity(keys, app.lua, idx(args, 0), identity);
+  project.get_key_identity(keys, app.lua,
+                           typecast_vocab<external_key_name>(idx(args, 0)),
+                           identity);
 
   keys.change_key_passphrase(identity.id);
   P(F("passphrase changed"));
@@ -233,7 +237,9 @@ CMD(trusted, "trusted", "", CMD_REF(key_
   for (unsigned int i = 3; i != args.size(); ++i)
     {
       key_identity_info identity;
-      project.get_key_identity(keys, app.lua, idx(args, i), identity);
+      project.get_key_identity(keys, app.lua,
+                               typecast_vocab<external_key_name>(idx(args, i)),
+                               identity);
       signers.insert(identity);
     }
 
============================================================
--- cmd_packet.cc	55ab79f2785e82c2c949dac98deb2ed5bedce715
+++ cmd_packet.cc	c40a801e198267ed71bd9f248e56068833c26c6e
@@ -37,7 +37,9 @@ CMD(pubkey, "pubkey", "", CMD_REF(packet
   project_t project(db);
 
   key_identity_info identity;
-  project.get_key_identity(keys, app.lua, idx(args, 0), identity);
+  project.get_key_identity(keys, app.lua,
+                           typecast_vocab<external_key_name>(idx(args, 0)),
+                           identity);
   bool exists(false);
   rsa_pub_key key;
   if (db.database_specified() && db.public_key_exists(identity.id))
@@ -73,7 +75,9 @@ CMD(privkey, "privkey", "", CMD_REF(pack
 
   key_name name = typecast_vocab<key_name>(idx(args, 0));
   key_identity_info identity;
-  project.get_key_identity(app.lua, idx(args, 0), identity);
+  project.get_key_identity(app.lua,
+                           typecast_vocab<external_key_name>(idx(args, 0)),
+                           identity);
   E(keys.key_pair_exists(identity.id), origin::user,
     F("public and private key '%s' do not exist in keystore")
     % idx(args, 0)());
============================================================
--- lua_hooks.cc	01bab6def621315198c957c066e3485417ffafc7
+++ lua_hooks.cc	0e452916d1f1fda856829a1f8887fc8f25d12e05
@@ -377,7 +377,7 @@ lua_hooks::hook_get_branch_key(branch_na
   else
     {
       key_identity_info identity;
-      project.get_key_identity(keys, *this, arg_type(key, origin::user), identity);
+      project.get_key_identity(keys, *this, external_key_name(key, origin::user), identity);
       k = identity.id;
       return true;
     }
@@ -779,7 +779,7 @@ lua_hooks::hook_get_netsync_key(utf8 con
   else
     {
       key_identity_info identity;
-      project.get_key_identity(keys, *this, arg_type(name, origin::user), identity);
+      project.get_key_identity(keys, *this, external_key_name(name, origin::user), identity);
       k = identity.id;
       return true;
     }
============================================================
--- project.cc	7f09669ff03f52d03219582eb0885e66fee42c57
+++ project.cc	da20b004d233b9bdace2efa9bcaaa9e861bd3e87
@@ -658,24 +658,7 @@ project_t::get_key_identity(lua_hooks & 
   get_key_identity(0, lua, input, output);
 }
 
-void
-project_t::get_key_identity(key_store & keys,
-                            lua_hooks & lua,
-                            arg_type const & input,
-                            key_identity_info & output) const
-{
-  get_key_identity(&keys, lua, typecast_vocab<external_key_name>(input), output);
-}
 
-void
-project_t::get_key_identity(lua_hooks & lua,
-                            arg_type const & input,
-                            key_identity_info & output) const
-{
-  get_key_identity(0, lua, typecast_vocab<external_key_name>(input), output);
-}
-
-
 // These should maybe be converted to member functions.
 
 string
============================================================
--- project.hh	a2f4dd3608d0bb80168a5aa41cef110a3f0c3af9
+++ project.hh	a156012f665b7608020320598c08541ee340cd3c
@@ -181,13 +181,6 @@ public:
   void get_key_identity(lua_hooks & lua,
                         external_key_name const & input,
                         key_identity_info & output) const;
-  void get_key_identity(key_store & keys,
-                        lua_hooks & lua,
-                        arg_type const & input,
-                        key_identity_info & output) const;
-  void get_key_identity(lua_hooks & lua,
-                        arg_type const & input,
-                        key_identity_info & output) const;
 };
 
 std::string