diff --git a/include/modules/dns.h b/include/modules/dns.h
index 898afe511..0773a8191 100644
--- a/include/modules/dns.h
+++ b/include/modules/dns.h
@@ -173,7 +173,7 @@ namespace DNS
 		/** Used to time out the query, xalls OnError and lets the TimerManager
 		 * delete this request.
 		 */
-		void Tick(time_t) override
+		void Tick() override
 		{
 			Log(LOG_DEBUG_2) << "Resolver: timeout for query " << this->name;
 			Query rr(*this);
diff --git a/include/timers.h b/include/timers.h
index ad436c0db..6233eb2d8 100644
--- a/include/timers.h
+++ b/include/timers.h
@@ -83,7 +83,7 @@ public:
 	/** Called when the timer ticks
 	 * This should be overridden with something useful
 	 */
-	virtual void Tick(time_t ctime) = 0;
+	virtual void Tick() = 0;
 };
 
 /** This class manages sets of Timers, and triggers them at their defined times.
@@ -109,7 +109,7 @@ public:
 	/** Tick all pending timers
 	 * @param ctime The current time
 	 */
-	static void TickTimers(time_t ctime = Anope::CurTime);
+	static void TickTimers();
 
 	/** Deletes all timers owned by the given module
 	 */
diff --git a/modules/botserv/bs_kick.cpp b/modules/botserv/bs_kick.cpp
index 737db21be..bdd1a4fff 100644
--- a/modules/botserv/bs_kick.cpp
+++ b/modules/botserv/bs_kick.cpp
@@ -1010,7 +1010,7 @@ public:
 	{
 	}
 
-	void Tick(time_t) override
+	void Tick() override
 	{
 		Log(LOG_DEBUG) << "bs_main: Running bandata purger";
 
diff --git a/modules/botserv/bs_set.cpp b/modules/botserv/bs_set.cpp
index 6929c96fb..3bf8184e4 100644
--- a/modules/botserv/bs_set.cpp
+++ b/modules/botserv/bs_set.cpp
@@ -83,7 +83,7 @@ public:
 		{
 		}
 
-		void Tick(time_t) override
+		void Tick() override
 		{
 			Channel *c = Channel::Find(chname);
 			if (c)
diff --git a/modules/chanserv/chanserv.cpp b/modules/chanserv/chanserv.cpp
index 783c47261..d2667432c 100644
--- a/modules/chanserv/chanserv.cpp
+++ b/modules/chanserv/chanserv.cpp
@@ -75,7 +75,7 @@ public:
 			/** Called when the delay is up
 			 * @param The current time
 			 */
-			void Tick(time_t) override
+			void Tick() override
 			{
 				if (!c)
 					return;
diff --git a/modules/chanserv/cs_ban.cpp b/modules/chanserv/cs_ban.cpp
index da54cd4f1..d400631ab 100644
--- a/modules/chanserv/cs_ban.cpp
+++ b/modules/chanserv/cs_ban.cpp
@@ -30,7 +30,7 @@ public:
 	{
 	}
 
-	void Tick(time_t ctime) override
+	void Tick() override
 	{
 		Channel *c = Channel::Find(this->channel);
 		if (c)
diff --git a/modules/dns.cpp b/modules/dns.cpp
index 3a2b2fb9a..221b533c8 100644
--- a/modules/dns.cpp
+++ b/modules/dns.cpp
@@ -493,7 +493,9 @@ public:
 		}
 
 		/* Times out after a few seconds */
-		void Tick(time_t) override { }
+		void Tick() override
+		{
+		}
 
 		void Reply(Packet *p) override
 		{
@@ -968,7 +970,7 @@ public:
 		return serial;
 	}
 
-	void Tick(time_t now) override
+	void Tick() override
 	{
 		Log(LOG_DEBUG_2) << "Resolver: Purging DNS cache";
 
@@ -979,7 +981,7 @@ public:
 			it_next = it;
 			++it_next;
 
-			if (req.created + static_cast<time_t>(req.ttl) < now)
+			if (req.created + static_cast<time_t>(req.ttl) < Anope::CurTime)
 				this->cache.erase(it);
 		}
 	}
diff --git a/modules/httpd.cpp b/modules/httpd.cpp
index f561283d7..5c7a74ff5 100644
--- a/modules/httpd.cpp
+++ b/modules/httpd.cpp
@@ -300,7 +300,7 @@ public:
 	{
 	}
 
-	void Tick(time_t) override
+	void Tick() override
 	{
 		while (!this->clients.empty())
 		{
diff --git a/modules/nickserv/nickserv.cpp b/modules/nickserv/nickserv.cpp
index 75ed0e8d3..2706ea23e 100644
--- a/modules/nickserv/nickserv.cpp
+++ b/modules/nickserv/nickserv.cpp
@@ -50,7 +50,7 @@ public:
 		return na;
 	}
 
-	void Tick(time_t t) override
+	void Tick() override
 	{
 		if (!u || !na)
 			return;
@@ -78,7 +78,7 @@ public:
 		n->Extend<bool>("HELD");
 	}
 
-	void Tick(time_t) override
+	void Tick() override
 	{
 		if (na)
 			na->Shrink<bool>("HELD");
@@ -121,7 +121,9 @@ public:
 		NickServReleases.erase(this->nick);
 	}
 
-	void Tick(time_t t) override { }
+	void Tick() override
+	{
+	}
 };
 
 class NickServCore final
diff --git a/modules/operserv/os_defcon.cpp b/modules/operserv/os_defcon.cpp
index 3f5395d48..3bf057877 100644
--- a/modules/operserv/os_defcon.cpp
+++ b/modules/operserv/os_defcon.cpp
@@ -123,7 +123,7 @@ public:
 		timeout = NULL;
 	}
 
-	void Tick(time_t) override
+	void Tick() override
 	{
 		if (DConfig.defaultlevel != level)
 		{
diff --git a/modules/proxyscan.cpp b/modules/proxyscan.cpp
index 601987bcd..3b4999cd4 100644
--- a/modules/proxyscan.cpp
+++ b/modules/proxyscan.cpp
@@ -216,7 +216,7 @@ class ModuleProxyScan final
 		{
 		}
 
-		void Tick(time_t) override
+		void Tick() override
 		{
 			for (std::set<ProxyConnect *>::iterator it = ProxyConnect::proxies.begin(), it_end = ProxyConnect::proxies.end(); it != it_end;)
 			{
diff --git a/modules/sasl.cpp b/modules/sasl.cpp
index adf044a0b..447662f34 100644
--- a/modules/sasl.cpp
+++ b/modules/sasl.cpp
@@ -340,7 +340,7 @@ public:
 		this->SendMessage(session, "M", buf.empty() ? "" : buf.substr(1));
 	}
 
-	void Tick(time_t) override
+	void Tick() override
 	{
 		for (std::map<Anope::string, Session *>::iterator it = sessions.begin(); it != sessions.end();)
 		{
diff --git a/src/main.cpp b/src/main.cpp
index 83ddfa13f..4fd433ce1 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -50,7 +50,7 @@ public:
 	{
 	}
 
-	void Tick(time_t) override
+	void Tick() override
 	{
 		Anope::SaveDatabases();
 	}
@@ -65,7 +65,7 @@ public:
 	{
 	}
 
-	void Tick(time_t) override
+	void Tick() override
 	{
 		FOREACH_MOD(OnExpireTick, ());
 	}
@@ -176,7 +176,7 @@ int main(int ac, char **av, char **envp)
 		/* Process timers */
 		if (Anope::CurTime - last_check >= Config->TimeoutCheck)
 		{
-			TimerManager::TickTimers(Anope::CurTime);
+			TimerManager::TickTimers();
 			last_check = Anope::CurTime;
 		}
 
diff --git a/src/timers.cpp b/src/timers.cpp
index 9e0f46277..fed5d6396 100644
--- a/src/timers.cpp
+++ b/src/timers.cpp
@@ -89,20 +89,20 @@ void TimerManager::DelTimer(Timer *t)
 	}
 }
 
-void TimerManager::TickTimers(time_t ctime)
+void TimerManager::TickTimers()
 {
 	while (!Timers.empty())
 	{
 		std::multimap<time_t, Timer *>::iterator it = Timers.begin();
 		Timer *t = it->second;
 
-		if (t->GetTimer() > ctime)
+		if (t->GetTimer() > Anope::CurTime)
 			break;
 
-		t->Tick(ctime);
+		t->Tick();
 
 		if (t->GetRepeat())
-			t->SetTimer(ctime + t->GetSecs());
+			t->SetTimer(Anope::CurTime + t->GetSecs());
 		else
 			delete t;
 	}
diff --git a/src/uplink.cpp b/src/uplink.cpp
index 0e4605841..f173bf10c 100644
--- a/src/uplink.cpp
+++ b/src/uplink.cpp
@@ -26,7 +26,7 @@ public:
 	{
 	}
 
-	void Tick(time_t) override
+	void Tick() override
 	{
 		try
 		{