diff --git a/channeld/channeld.c b/channeld/channeld.c
index 895d92131..6b19d9400 100644
--- a/channeld/channeld.c
+++ b/channeld/channeld.c
@@ -4077,7 +4077,7 @@ int main(int argc, char *argv[])
 
 		expired = timers_expire(&peer->timers, now);
 		if (expired) {
-			timer_expired(peer, expired);
+			timer_expired(expired);
 			continue;
 		}
 
diff --git a/common/timeout.c b/common/timeout.c
index a19b85ffd..d4b4b480f 100644
--- a/common/timeout.c
+++ b/common/timeout.c
@@ -36,7 +36,7 @@ void *reltimer_arg(struct oneshot *t)
 	return t->arg;
 }
 
-void timer_expired(tal_t *ctx, struct timer *timer)
+void timer_expired(struct timer *timer)
 {
 	struct oneshot *t = container_of(timer, struct oneshot, timer);
 
diff --git a/common/timeout.h b/common/timeout.h
index a515e72eb..55b1a4b63 100644
--- a/common/timeout.h
+++ b/common/timeout.h
@@ -18,6 +18,6 @@ struct oneshot *new_reltimer_(struct timers *timers,
 /* Get timer arg. */
 void *reltimer_arg(struct oneshot *t);
 
-void timer_expired(tal_t *ctx, struct timer *timer);
+void timer_expired(struct timer *timer);
 
 #endif /* LIGHTNING_COMMON_TIMEOUT_H */
diff --git a/connectd/connectd.c b/connectd/connectd.c
index 2a7128f49..e855552f9 100644
--- a/connectd/connectd.c
+++ b/connectd/connectd.c
@@ -2091,7 +2091,7 @@ int main(int argc, char *argv[])
 	for (;;) {
 		struct timer *expired;
 		io_loop(&daemon->timers, &expired);
-		timer_expired(daemon, expired);
+		timer_expired(expired);
 	}
 }
 
diff --git a/gossipd/gossipd.c b/gossipd/gossipd.c
index 250cd7f4f..3fc121b83 100644
--- a/gossipd/gossipd.c
+++ b/gossipd/gossipd.c
@@ -1548,7 +1548,7 @@ int main(int argc, char *argv[])
 		struct timer *expired = NULL;
 		io_loop(&daemon->timers, &expired);
 
-		timer_expired(daemon, expired);
+		timer_expired(expired);
 	}
 }
 
diff --git a/gossipd/test/run-onion_message.c b/gossipd/test/run-onion_message.c
index 6cfa824e8..473554f3f 100644
--- a/gossipd/test/run-onion_message.c
+++ b/gossipd/test/run-onion_message.c
@@ -302,7 +302,7 @@ void status_setup_async(struct daemon_conn *master UNNEEDED)
 void subdaemon_setup(int argc UNNEEDED, char *argv[])
 { fprintf(stderr, "subdaemon_setup called!\n"); abort(); }
 /* Generated stub for timer_expired */
-void timer_expired(tal_t *ctx UNNEEDED, struct timer *timer UNNEEDED)
+void timer_expired(struct timer *timer UNNEEDED)
 { fprintf(stderr, "timer_expired called!\n"); abort(); }
 /* Generated stub for towire_gossipd_addgossip_reply */
 u8 *towire_gossipd_addgossip_reply(const tal_t *ctx UNNEEDED, const wirestring *err UNNEEDED)
diff --git a/gossipd/test/run-txout_failure.c b/gossipd/test/run-txout_failure.c
index 09b1ddbba..ba7791c32 100644
--- a/gossipd/test/run-txout_failure.c
+++ b/gossipd/test/run-txout_failure.c
@@ -162,7 +162,7 @@ int main(int argc, char *argv[])
 	t = timers_expire(&timers, timemono_add(time_mono(),
 						time_from_sec(3601)));
 	assert(t);
-	timer_expired(NULL, t);
+	timer_expired(t);
 
 	/* Still there, just old.  Refresh scid1 */
 	assert(rstate->num_txout_failures == 0);
@@ -172,7 +172,7 @@ int main(int argc, char *argv[])
 	t = timers_expire(&timers, timemono_add(time_mono(),
 						time_from_sec(3601)));
 	assert(t);
-	timer_expired(NULL, t);
+	timer_expired(t);
 
 	assert(rstate->num_txout_failures == 0);
 	assert(in_txout_failures(rstate, &scid1));
diff --git a/lightningd/io_loop_with_timers.c b/lightningd/io_loop_with_timers.c
index 20f9b0618..246ca9979 100644
--- a/lightningd/io_loop_with_timers.c
+++ b/lightningd/io_loop_with_timers.c
@@ -26,7 +26,7 @@ void *io_loop_with_timers(struct lightningd *ld)
 			/* This routine is legal in early startup, too. */
 			if (ld->wallet)
 				db_begin_transaction(ld->wallet->db);
-			timer_expired(ld, expired);
+			timer_expired(expired);
 			if (ld->wallet)
 				db_commit_transaction(ld->wallet->db);
 		}
diff --git a/lightningd/test/run-find_my_abspath.c b/lightningd/test/run-find_my_abspath.c
index 41db06076..24e53c97a 100644
--- a/lightningd/test/run-find_my_abspath.c
+++ b/lightningd/test/run-find_my_abspath.c
@@ -207,7 +207,7 @@ void shutdown_plugins(struct lightningd *ld UNNEEDED)
 void stop_topology(struct chain_topology *topo UNNEEDED)
 { fprintf(stderr, "stop_topology called!\n"); abort(); }
 /* Generated stub for timer_expired */
-void timer_expired(tal_t *ctx UNNEEDED, struct timer *timer UNNEEDED)
+void timer_expired(struct timer *timer UNNEEDED)
 { fprintf(stderr, "timer_expired called!\n"); abort(); }
 /* Generated stub for towire_bigsize */
 void towire_bigsize(u8 **pptr UNNEEDED, const bigsize_t val UNNEEDED)