diff --git a/Cargo.toml b/Cargo.toml
index a54bd45..174f32f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -9,6 +9,11 @@ members = [
   "ansi",
 ]
 
+resolver = "2"
+
 [profile.release-with-debug]
 inherits = "release"
 debug = true
+
+[profile.dev]
+lto = false
diff --git a/blastmud_game/Cargo.toml b/blastmud_game/Cargo.toml
index 891cb92..9e919a3 100644
--- a/blastmud_game/Cargo.toml
+++ b/blastmud_game/Cargo.toml
@@ -50,6 +50,3 @@ tokio-test = "0.4.2"
 default = []
 # Export data to YAML files in /tmp on startup
 yamldump = []
-
-[profile.dev]
-lto = false
diff --git a/blastmud_game/src/regular_tasks.rs b/blastmud_game/src/regular_tasks.rs
index 016987f..b4cc218 100644
--- a/blastmud_game/src/regular_tasks.rs
+++ b/blastmud_game/src/regular_tasks.rs
@@ -47,29 +47,23 @@ fn task_handler_registry(
     > = OnceCell::new();
     TASK_HANDLER_REGISTRY.get_or_init(|| {
         vec![
-            ("RunQueuedCommand", queued_command::HANDLER.clone()),
-            ("NPCSay", npc::SAY_HANDLER.clone()),
-            ("NPCWander", npc::WANDER_HANDLER.clone()),
-            ("NPCAggro", npc::AGGRO_HANDLER.clone()),
-            ("AttackTick", combat::TASK_HANDLER.clone()),
-            ("RecloneNPC", npc::RECLONE_HANDLER.clone()),
-            ("RotCorpse", combat::ROT_CORPSE_HANDLER.clone()),
-            ("DelayedHealth", effect::DELAYED_HEALTH_HANDLER.clone()),
-            ("ExpireItem", drop::EXPIRE_ITEM_HANDLER.clone()),
-            ("ChargeRoom", rent::CHARGE_ROOM_HANDLER.clone()),
-            ("SwingShut", open::SWING_SHUT_HANDLER.clone()),
-            ("DestroyUser", delete::DESTROY_USER_HANDLER.clone()),
-            ("ChargeWages", hire::CHARGE_WAGES_HANDLER.clone()),
-            ("TickUrges", urges::TICK_URGES_HANDLER.clone()),
-            ("ResetSpawns", spawn::RESET_SPAWNS_HANDLER.clone()),
-            (
-                "ResetHanoi",
-                computer_museum_npcs::RESET_GAME_HANDLER.clone(),
-            ),
-            (
-                "HospitalERSeePatient",
-                general_hospital::SEE_PATIENT_TASK.clone(),
-            ),
+            ("RunQueuedCommand", queued_command::HANDLER),
+            ("NPCSay", npc::SAY_HANDLER),
+            ("NPCWander", npc::WANDER_HANDLER),
+            ("NPCAggro", npc::AGGRO_HANDLER),
+            ("AttackTick", combat::TASK_HANDLER),
+            ("RecloneNPC", npc::RECLONE_HANDLER),
+            ("RotCorpse", combat::ROT_CORPSE_HANDLER),
+            ("DelayedHealth", effect::DELAYED_HEALTH_HANDLER),
+            ("ExpireItem", drop::EXPIRE_ITEM_HANDLER),
+            ("ChargeRoom", rent::CHARGE_ROOM_HANDLER),
+            ("SwingShut", open::SWING_SHUT_HANDLER),
+            ("DestroyUser", delete::DESTROY_USER_HANDLER),
+            ("ChargeWages", hire::CHARGE_WAGES_HANDLER),
+            ("TickUrges", urges::TICK_URGES_HANDLER),
+            ("ResetSpawns", spawn::RESET_SPAWNS_HANDLER),
+            ("ResetHanoi", computer_museum_npcs::RESET_GAME_HANDLER),
+            ("HospitalERSeePatient", general_hospital::SEE_PATIENT_TASK),
         ]
         .into_iter()
         .collect()
diff --git a/blastmud_game/src/static_content/journals.rs b/blastmud_game/src/static_content/journals.rs
index 6f2c846..8eeb863 100644
--- a/blastmud_game/src/static_content/journals.rs
+++ b/blastmud_game/src/static_content/journals.rs
@@ -106,11 +106,11 @@ pub fn checkers_by_npc(
                 jc.kill_subscriptions()
                     .into_iter()
                     .filter_map(|sub| match sub {
-                        KillSubscriptionType::SpecificNPC { code } => Some((code.clone(), *jc)),
+                        KillSubscriptionType::SpecificNPC { code } => Some((code, *jc)),
                         _ => None,
                     })
             })
-            .group_by(|v| v.0.clone());
+            .group_by(|v| v.0);
         npc_groups
             .into_iter()
             .map(|(species, g)| (species, g.into_iter().map(|v| v.1).collect()))