Fix some compiler warnings

28 files changed, 236 insertions, 227 deletions

diff --git a/include/modules/sasl.h b/include/modules/sasl.h
index 980a5da2e..f31be77cd 100644
--- a/include/modules/sasl.h
+++ b/include/modules/sasl.h
@@ -29,7 +29,7 @@ namespace SASL
 	};
 
 	class Mechanism;
-	struct Session;
+	class Session;
 
 	class Service : public ::Service
 	{
diff --git a/modules/botserv/badwords.cpp b/modules/botserv/badwords.cpp
index 6f5ccf1c5..d504763be 100644
--- a/modules/botserv/badwords.cpp
+++ b/modules/botserv/badwords.cpp
@@ -256,8 +256,6 @@ class CommandBSBadwords : public Command
 			return;
 		}
 
-		bool override = !source.AccessFor(ci).HasPriv("BADWORDS");
-
 		/* Special case: is it a number/list?  Only do search if it isn't. */
 		if (!word.empty() && isdigit(word[0]) && word.find_first_not_of("1234567890,-") == Anope::string::npos)
 		{
diff --git a/modules/botserv/kick.cpp b/modules/botserv/kick.cpp
index 2fbaf4c1b..7c7eb3829 100644
--- a/modules/botserv/kick.cpp
+++ b/modules/botserv/kick.cpp
@@ -237,9 +237,9 @@ ChanServ::Channel *KickerDataImpl::GetChannel()
 	return Get(&KickerDataType::channel);
 }
 
-void KickerDataImpl::SetChannel(ChanServ::Channel *channel)
+void KickerDataImpl::SetChannel(ChanServ::Channel *chan)
 {
-	Set(&KickerDataType::amsgs, channel);
+	Set(&KickerDataType::amsgs, chan);
 }
 
 bool KickerDataImpl::GetAmsgs()
diff --git a/modules/chanserv/access.cpp b/modules/chanserv/access.cpp
index 43892a34b..886f02778 100644
--- a/modules/chanserv/access.cpp
+++ b/modules/chanserv/access.cpp
@@ -36,8 +36,8 @@ class AccessChanAccessImpl : public AccessChanAccess
 
 	using AccessChanAccess::AccessChanAccess;
 
-	int GetLevel();
-	void SetLevel(const int &);
+	int GetLevel() override;
+	void SetLevel(const int &) override;
 
 	bool HasPriv(const Anope::string &name) override
 	{
@@ -179,16 +179,16 @@ class CommandCSAccess : public Command
 
 		for (unsigned i = ci->GetAccessCount(); i > 0; --i)
 		{
-			ChanServ::ChanAccess *access = ci->GetAccess(i - 1);
-			if (mask.equals_ci(access->Mask()))
+			ChanServ::ChanAccess *a = ci->GetAccess(i - 1);
+			if (mask.equals_ci(a->Mask()))
 			{
 				/* Don't allow lowering from a level >= u_level */
-				if ((!highest || *access >= *highest) && !u_access.founder && !source.HasOverridePriv("chanserv/access/modify"))
+				if ((!highest || *a >= *highest) && !u_access.founder && !source.HasOverridePriv("chanserv/access/modify"))
 				{
-					source.Reply(_("Access denied. You do not have enough privileges on \002{0}\002 to lower the access of \002{1}\002."), ci->GetName(), access->Mask());
+					source.Reply(_("Access denied. You do not have enough privileges on \002{0}\002 to lower the access of \002{1}\002."), ci->GetName(), a->Mask());
 					return;
 				}
-				access->Delete();
+				a->Delete();
 				break;
 			}
 		}
@@ -459,7 +459,6 @@ class CommandCSAccess : public Command
 
 		source.Reply(_("The access list of \002{0}\002 has been cleared."), ci->GetName());
 
-		bool override = !source.IsFounder(ci);
 		logger.Command(source, ci, _("{source} used {command} on {channel} to clear the access list"));
 	}
 
@@ -489,7 +488,6 @@ class CommandCSAccess : public Command
 		}
 
 		bool is_list = cmd.equals_ci("LIST") || cmd.equals_ci("VIEW");
-		bool is_clear = cmd.equals_ci("CLEAR");
 		bool is_del = cmd.equals_ci("DEL");
 
 		ChanServ::AccessGroup access = source.AccessFor(ci);
diff --git a/modules/chanserv/akick.cpp b/modules/chanserv/akick.cpp
index 9014ad9d6..bbdd614e5 100644
--- a/modules/chanserv/akick.cpp
+++ b/modules/chanserv/akick.cpp
@@ -95,9 +95,9 @@ Anope::string AutoKickImpl::GetMask()
 	return Get(&AutoKickType::mask);
 }
 
-void AutoKickImpl::SetMask(const Anope::string &mask)
+void AutoKickImpl::SetMask(const Anope::string &m)
 {
-	Set(&AutoKickType::mask, mask);
+	Set(&AutoKickType::mask, m);
 }
 
 NickServ::Account *AutoKickImpl::GetAccount()
diff --git a/modules/chanserv/main/channel.cpp b/modules/chanserv/main/channel.cpp
index f4b0e2578..a82ee31a4 100644
--- a/modules/chanserv/main/channel.cpp
+++ b/modules/chanserv/main/channel.cpp
@@ -50,9 +50,9 @@ Anope::string ChannelImpl::GetName()
 	return Get<Anope::string>(&ChannelType::name);
 }
 
-void ChannelImpl::SetName(const Anope::string &name)
+void ChannelImpl::SetName(const Anope::string &n)
 {
-	Set(&ChannelType::name, name);
+	Set(&ChannelType::name, n);
 }
 
 Anope::string ChannelImpl::GetDesc()
@@ -60,9 +60,9 @@ Anope::string ChannelImpl::GetDesc()
 	return Get(&ChannelType::desc);
 }
 
-void ChannelImpl::SetDesc(const Anope::string &desc)
+void ChannelImpl::SetDesc(const Anope::string &d)
 {
-	Set(&ChannelType::desc, desc);
+	Set(&ChannelType::desc, d);
 }
 
 time_t ChannelImpl::GetTimeRegistered()
@@ -150,20 +150,20 @@ BotInfo *ChannelImpl::GetBI()
 	return Get(&ChannelType::servicebot);
 }
 
-void ChannelImpl::SetBI(BotInfo *bi)
+void ChannelImpl::SetBI(BotInfo *b)
 {
-	Set(&ChannelType::servicebot, bi);
+	Set(&ChannelType::servicebot, b);
 }
 
 ServiceBot *ChannelImpl::GetBot()
 {
-	BotInfo *bi = GetBI();
-	return bi ? bi->bot : nullptr;
+	BotInfo *b = GetBI();
+	return b ? b->bot : nullptr;
 }
 
-void ChannelImpl::SetBot(ServiceBot *bi)
+void ChannelImpl::SetBot(ServiceBot *b)
 {
-	SetBI(bi->bi);
+	SetBI(b->bi);
 }
 
 MemoServ::MemoInfo *ChannelImpl::GetMemos()
@@ -196,9 +196,9 @@ bool ChannelImpl::IsGreet()
 	return Get(&ChannelType::greet);
 }
 
-void ChannelImpl::SetGreet(bool greet)
+void ChannelImpl::SetGreet(bool g)
 {
-	Set(&ChannelType::greet, greet);
+	Set(&ChannelType::greet, g);
 }
 
 bool ChannelImpl::IsFantasy()
@@ -206,9 +206,9 @@ bool ChannelImpl::IsFantasy()
 	return Get(&ChannelType::fantasy);
 }
 
-void ChannelImpl::SetFantasy(bool fantasy)
+void ChannelImpl::SetFantasy(bool f)
 {
-	Set(&ChannelType::fantasy, fantasy);
+	Set(&ChannelType::fantasy, f);
 }
 
 bool ChannelImpl::IsNoAutoop()
@@ -216,9 +216,9 @@ bool ChannelImpl::IsNoAutoop()
 	return Get(&ChannelType::noautoop);
 }
 
-void ChannelImpl::SetNoAutoop(bool noautoop)
+void ChannelImpl::SetNoAutoop(bool n)
 {
-	Set(&ChannelType::noautoop, noautoop);
+	Set(&ChannelType::noautoop, n);
 }
 
 bool ChannelImpl::IsPeace()
@@ -226,9 +226,9 @@ bool ChannelImpl::IsPeace()
 	return Get(&ChannelType::peace);
 }
 
-void ChannelImpl::SetPeace(bool peace)
+void ChannelImpl::SetPeace(bool p)
 {
-	Set(&ChannelType::peace, peace);
+	Set(&ChannelType::peace, p);
 }
 
 bool ChannelImpl::IsSecureFounder()
@@ -236,9 +236,9 @@ bool ChannelImpl::IsSecureFounder()
 	return Get(&ChannelType::securefounder);
 }
 
-void ChannelImpl::SetSecureFounder(bool securefounder)
+void ChannelImpl::SetSecureFounder(bool s)
 {
-	Set(&ChannelType::securefounder, securefounder);
+	Set(&ChannelType::securefounder, s);
 }
 
 bool ChannelImpl::IsRestricted()
@@ -246,9 +246,9 @@ bool ChannelImpl::IsRestricted()
 	return Get(&ChannelType::restricted);
 }
 
-void ChannelImpl::SetRestricted(bool restricted)
+void ChannelImpl::SetRestricted(bool r)
 {
-	Set(&ChannelType::restricted, restricted);
+	Set(&ChannelType::restricted, r);
 }
 
 bool ChannelImpl::IsSecureOps()
@@ -256,9 +256,9 @@ bool ChannelImpl::IsSecureOps()
 	return Get(&ChannelType::secureops);
 }
 
-void ChannelImpl::SetSecureOps(bool secureops)
+void ChannelImpl::SetSecureOps(bool s)
 {
-	Set(&ChannelType::secureops, secureops);
+	Set(&ChannelType::secureops, s);
 }
 
 bool ChannelImpl::IsSignKick()
@@ -266,9 +266,9 @@ bool ChannelImpl::IsSignKick()
 	return Get(&ChannelType::signkick);
 }
 
-void ChannelImpl::SetSignKick(bool signkick)
+void ChannelImpl::SetSignKick(bool s)
 {
-	Set(&ChannelType::signkick, signkick);
+	Set(&ChannelType::signkick, s);
 }
 
 bool ChannelImpl::IsSignKickLevel()
@@ -276,9 +276,9 @@ bool ChannelImpl::IsSignKickLevel()
 	return Get(&ChannelType::signkicklevel);
 }
 
-void ChannelImpl::SetSignKickLevel(bool signkicklevel)
+void ChannelImpl::SetSignKickLevel(bool s)
 {
-	Set(&ChannelType::signkicklevel, signkicklevel);
+	Set(&ChannelType::signkicklevel, s);
 }
 
 bool ChannelImpl::IsNoExpire()
@@ -286,9 +286,9 @@ bool ChannelImpl::IsNoExpire()
 	return Get(&ChannelType::noexpire);
 }
 
-void ChannelImpl::SetNoExpire(bool noexpire)
+void ChannelImpl::SetNoExpire(bool n)
 {
-	Set(&ChannelType::noexpire, noexpire);
+	Set(&ChannelType::noexpire, n);
 }
 
 bool ChannelImpl::IsKeepModes()
@@ -296,9 +296,9 @@ bool ChannelImpl::IsKeepModes()
 	return Get(&ChannelType::keepmodes);
 }
 
-void ChannelImpl::SetKeepModes(bool keepmodes)
+void ChannelImpl::SetKeepModes(bool k)
 {
-	Set(&ChannelType::keepmodes, keepmodes);
+	Set(&ChannelType::keepmodes, k);
 }
 
 bool ChannelImpl::IsPersist()
@@ -306,9 +306,9 @@ bool ChannelImpl::IsPersist()
 	return Get(&ChannelType::persist);
 }
 
-void ChannelImpl::SetPersist(bool persist)
+void ChannelImpl::SetPersist(bool p)
 {
-	Set(&ChannelType::persist, persist);
+	Set(&ChannelType::persist, p);
 }
 
 bool ChannelImpl::IsTopicLock()
@@ -316,9 +316,9 @@ bool ChannelImpl::IsTopicLock()
 	return Get(&ChannelType::topiclock);
 }
 
-void ChannelImpl::SetTopicLock(bool topiclock)
+void ChannelImpl::SetTopicLock(bool t)
 {
-	Set(&ChannelType::topiclock, topiclock);
+	Set(&ChannelType::topiclock, t);
 }
 
 bool ChannelImpl::IsKeepTopic()
@@ -326,9 +326,9 @@ bool ChannelImpl::IsKeepTopic()
 	return Get(&ChannelType::keeptopic);
 }
 
-void ChannelImpl::SetKeepTopic(bool keeptopic)
+void ChannelImpl::SetKeepTopic(bool k)
 {
-	Set(&ChannelType::keeptopic, keeptopic);
+	Set(&ChannelType::keeptopic, k);
 }
 
 bool ChannelImpl::IsPrivate()
@@ -336,16 +336,16 @@ bool ChannelImpl::IsPrivate()
 	return Get(&ChannelType::_private);
 }
 
-void ChannelImpl::SetPrivate(bool _private)
+void ChannelImpl::SetPrivate(bool p)
 {
-	Set(&ChannelType::_private, _private);
+	Set(&ChannelType::_private, p);
 }
 
 ServiceBot *ChannelImpl::WhoSends()
 {
-	BotInfo *bi = GetBI();
-	if (bi != nullptr)
-		return bi->bot;
+	BotInfo *b = GetBI();
+	if (b != nullptr)
+		return b->bot;
 
 	return Config->GetClient("ChanServ");
 }
diff --git a/modules/chanserv/mode.cpp b/modules/chanserv/mode.cpp
index 9b98534a0..b1639baa0 100644
--- a/modules/chanserv/mode.cpp
+++ b/modules/chanserv/mode.cpp
@@ -96,9 +96,9 @@ Anope::string ModeLockImpl::GetName()
 	return Get(&ModeLockType::name);
 }
 
-void ModeLockImpl::SetName(const Anope::string &name)
+void ModeLockImpl::SetName(const Anope::string &n)
 {
-	Set(&ModeLockType::name, name);
+	Set(&ModeLockType::name, n);
 }
 
 Anope::string ModeLockImpl::GetParam()
diff --git a/modules/chanserv/suspend.cpp b/modules/chanserv/suspend.cpp
index 2d72924e3..73d5ab6d1 100644
--- a/modules/chanserv/suspend.cpp
+++ b/modules/chanserv/suspend.cpp
@@ -82,9 +82,9 @@ Anope::string CSSuspendInfoImpl::GetBy()
 	return Get(&CSSuspendType::by);
 }
 
-void CSSuspendInfoImpl::SetBy(const Anope::string &by)
+void CSSuspendInfoImpl::SetBy(const Anope::string &b)
 {
-	Set(&CSSuspendType::by, by);
+	Set(&CSSuspendType::by, b);
 }
 
 Anope::string CSSuspendInfoImpl::GetReason()
@@ -92,9 +92,9 @@ Anope::string CSSuspendInfoImpl::GetReason()
 	return Get(&CSSuspendType::reason);
 }
 
-void CSSuspendInfoImpl::SetReason(const Anope::string &reason)
+void CSSuspendInfoImpl::SetReason(const Anope::string &r)
 {
-	Set(&CSSuspendType::reason, reason);
+	Set(&CSSuspendType::reason, r);
 }
 
 time_t CSSuspendInfoImpl::GetWhen()
diff --git a/modules/database/sql.cpp b/modules/database/sql.cpp
index b14674b44..d0835be44 100644
--- a/modules/database/sql.cpp
+++ b/modules/database/sql.cpp
@@ -205,8 +205,8 @@ class DBSQL : public Module, public Pipe
 
 		if (type == nullptr)
 		{
-			for (Serialize::TypeBase *type : Serialize::TypeBase::GetTypes())
-				GetRefs(object, type, edges);
+			for (Serialize::TypeBase *t : Serialize::TypeBase::GetTypes())
+				GetRefs(object, t, edges);
 		}
 		else
 		{
diff --git a/modules/global/main/global.cpp b/modules/global/main/global.cpp
index f3d64a87d..103d9efc3 100644
--- a/modules/global/main/global.cpp
+++ b/modules/global/main/global.cpp
@@ -40,11 +40,11 @@ class GlobalCore : public Module
 
  public:
 	GlobalCore(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, PSEUDOCLIENT | VENDOR)
+		, GlobalService(this)
 		, EventHook<Event::Restart>(this)
 		, EventHook<Event::Shutdown>(this)
 		, EventHook<Event::NewServer>(this)
 		, EventHook<Event::Help>(this)
-		, GlobalService(this)
 	{
 	}
 
diff --git a/modules/hostserv/request.cpp b/modules/hostserv/request.cpp
index 596a0050e..3df0f1e97 100644
--- a/modules/hostserv/request.cpp
+++ b/modules/hostserv/request.cpp
@@ -67,9 +67,9 @@ NickServ::Account *HostRequest::GetAccount()
 	return Get(&HostRequestType::acc);
 }
 
-void HostRequest::SetAccount(NickServ::Account *acc)
+void HostRequest::SetAccount(NickServ::Account *a)
 {
-	Set(&HostRequestType::acc, acc);
+	Set(&HostRequestType::acc, a);
 }
 
 Anope::string HostRequest::GetIdent()
diff --git a/modules/memoserv/main/ignore.cpp b/modules/memoserv/main/ignore.cpp
index 9d2fb6d85..a9cc6c386 100644
--- a/modules/memoserv/main/ignore.cpp
+++ b/modules/memoserv/main/ignore.cpp
@@ -39,8 +39,8 @@ Anope::string IgnoreImpl::GetMask()
 	return Get(&IgnoreType::mask);
 }
 
-void IgnoreImpl::SetMask(const Anope::string &mask)
+void IgnoreImpl::SetMask(const Anope::string &m)
 {
-	Set(&IgnoreType::mask, mask);
+	Set(&IgnoreType::mask, m);
 }
 
diff --git a/modules/memoserv/main/memoinfo.cpp b/modules/memoserv/main/memoinfo.cpp
index 09c45d278..93d11eb0e 100644
--- a/modules/memoserv/main/memoinfo.cpp
+++ b/modules/memoserv/main/memoinfo.cpp
@@ -67,9 +67,9 @@ ChanServ::Channel *MemoInfoImpl::GetChannel()
 	return Get(&MemoInfoType::channel);
 }
 
-void MemoInfoImpl::SetChannel(ChanServ::Channel *channel)
+void MemoInfoImpl::SetChannel(ChanServ::Channel *c)
 {
-	Set(&MemoInfoType::channel, channel);
+	Set(&MemoInfoType::channel, c);
 }
 
 int16_t MemoInfoImpl::GetMemoMax()
@@ -87,9 +87,9 @@ bool MemoInfoImpl::IsHardMax()
 	return Get(&MemoInfoType::hardmax);
 }
 
-void MemoInfoImpl::SetHardMax(bool hardmax)
+void MemoInfoImpl::SetHardMax(bool h)
 {
-	Set(&MemoInfoType::hardmax, hardmax);
+	Set(&MemoInfoType::hardmax, h);
 }
 
 std::vector<MemoServ::Memo *> MemoInfoImpl::GetMemos()
diff --git a/modules/nickserv/main/account.cpp b/modules/nickserv/main/account.cpp
index 9c3275cbe..7a50b3845 100644
--- a/modules/nickserv/main/account.cpp
+++ b/modules/nickserv/main/account.cpp
@@ -66,9 +66,9 @@ Anope::string AccountImpl::GetEmail()
 	return Get(&AccountType::email);
 }
 
-void AccountImpl::SetEmail(const Anope::string &email)
+void AccountImpl::SetEmail(const Anope::string &e)
 {
-	Set(&AccountType::email, email);
+	Set(&AccountType::email, e);
 }
 
 Anope::string AccountImpl::GetLanguage()
@@ -86,9 +86,9 @@ Oper *AccountImpl::GetOper()
 	return Get(&AccountType::oper);
 }
 
-void AccountImpl::SetOper(Oper *oper)
+void AccountImpl::SetOper(Oper *o)
 {
-	Set(&AccountType::oper, oper);
+	Set(&AccountType::oper, o);
 }
 
 MemoServ::MemoInfo *AccountImpl::GetMemos()
@@ -101,9 +101,9 @@ Anope::string AccountImpl::GetGreet()
 	return Get(&AccountType::greet);
 }
 
-void AccountImpl::SetGreet(const Anope::string &greet)
+void AccountImpl::SetGreet(const Anope::string &g)
 {
-	Set(&AccountType::greet, greet);
+	Set(&AccountType::greet, g);
 }
 
 bool AccountImpl::IsUnconfirmed()
@@ -111,9 +111,9 @@ bool AccountImpl::IsUnconfirmed()
 	return Get(&AccountType::unconfirmed);
 }
 
-void AccountImpl::SetUnconfirmed(bool unconfirmed)
+void AccountImpl::SetUnconfirmed(bool u)
 {
-	Set(&AccountType::greet, unconfirmed);
+	Set(&AccountType::greet, u);
 }
 
 bool AccountImpl::IsPrivate()
@@ -121,9 +121,9 @@ bool AccountImpl::IsPrivate()
 	return Get(&AccountType::_private);
 }
 
-void AccountImpl::SetPrivate(bool _private)
+void AccountImpl::SetPrivate(bool p)
 {
-	Set(&AccountType::_private, _private);
+	Set(&AccountType::_private, p);
 }
 
 bool AccountImpl::IsAutoOp()
@@ -131,9 +131,9 @@ bool AccountImpl::IsAutoOp()
 	return Get(&AccountType::autoop);
 }
 
-void AccountImpl::SetAutoOp(bool autoop)
+void AccountImpl::SetAutoOp(bool a)
 {
-	Set(&AccountType::autoop, autoop);
+	Set(&AccountType::autoop, a);
 }
 
 bool AccountImpl::IsKeepModes()
@@ -141,9 +141,9 @@ bool AccountImpl::IsKeepModes()
 	return Get(&AccountType::keepmodes);
 }
 
-void AccountImpl::SetKeepModes(bool keepmodes)
+void AccountImpl::SetKeepModes(bool k)
 {
-	Set(&AccountType::keepmodes, keepmodes);
+	Set(&AccountType::keepmodes, k);
 }
 
 bool AccountImpl::IsKillProtect()
@@ -151,9 +151,9 @@ bool AccountImpl::IsKillProtect()
 	return Get(&AccountType::killprotect);
 }
 
-void AccountImpl::SetKillProtect(bool killprotect)
+void AccountImpl::SetKillProtect(bool k)
 {
-	Set(&AccountType::killprotect, killprotect);
+	Set(&AccountType::killprotect, k);
 }
 
 bool AccountImpl::IsKillQuick()
@@ -161,9 +161,9 @@ bool AccountImpl::IsKillQuick()
 	return Get(&AccountType::killquick);
 }
 
-void AccountImpl::SetKillQuick(bool killquick)
+void AccountImpl::SetKillQuick(bool k)
 {
-	Set(&AccountType::killquick, killquick);
+	Set(&AccountType::killquick, k);
 }
 
 bool AccountImpl::IsKillImmed()
@@ -171,9 +171,9 @@ bool AccountImpl::IsKillImmed()
 	return Get(&AccountType::killimmed);
 }
 
-void AccountImpl::SetKillImmed(bool killimmed)
+void AccountImpl::SetKillImmed(bool k)
 {
-	Set(&AccountType::killimmed, killimmed);
+	Set(&AccountType::killimmed, k);
 }
 
 bool AccountImpl::IsMsg()
@@ -181,9 +181,9 @@ bool AccountImpl::IsMsg()
 	return Get(&AccountType::msg);
 }
 
-void AccountImpl::SetMsg(bool msg)
+void AccountImpl::SetMsg(bool m)
 {
-	Set(&AccountType::msg, msg);
+	Set(&AccountType::msg, m);
 }
 
 bool AccountImpl::IsMemoSignon()
@@ -191,9 +191,9 @@ bool AccountImpl::IsMemoSignon()
 	return Get(&AccountType::memosignon);
 }
 
-void AccountImpl::SetMemoSignon(bool memosignon)
+void AccountImpl::SetMemoSignon(bool m)
 {
-	Set(&AccountType::memosignon, memosignon);
+	Set(&AccountType::memosignon, m);
 }
 
 bool AccountImpl::IsMemoReceive()
@@ -201,9 +201,9 @@ bool AccountImpl::IsMemoReceive()
 	return Get(&AccountType::memoreceive);
 }
 
-void AccountImpl::SetMemoReceive(bool memoreceive)
+void AccountImpl::SetMemoReceive(bool m)
 {
-	Set(&AccountType::memoreceive, memoreceive);
+	Set(&AccountType::memoreceive, m);
 }
 
 bool AccountImpl::IsMemoMail()
@@ -211,9 +211,9 @@ bool AccountImpl::IsMemoMail()
 	return Get(&AccountType::memomail);
 }
 
-void AccountImpl::SetMemoMail(bool memomail)
+void AccountImpl::SetMemoMail(bool m)
 {
-	Set(&AccountType::memomail, memomail);
+	Set(&AccountType::memomail, m);
 }
 
 bool AccountImpl::IsHideEmail()
@@ -221,9 +221,9 @@ bool AccountImpl::IsHideEmail()
 	return Get(&AccountType::hideemail);
 }
 
-void AccountImpl::SetHideEmail(bool hideemail)
+void AccountImpl::SetHideEmail(bool h)
 {
-	Set(&AccountType::hideemail, hideemail);
+	Set(&AccountType::hideemail, h);
 }
 
 bool AccountImpl::IsHideMask()
@@ -231,9 +231,9 @@ bool AccountImpl::IsHideMask()
 	return Get(&AccountType::hidemask);
 }
 
-void AccountImpl::SetHideMask(bool hidemask)
+void AccountImpl::SetHideMask(bool h)
 {
-	Set(&AccountType::hidemask, hidemask);
+	Set(&AccountType::hidemask, h);
 }
 
 bool AccountImpl::IsHideStatus()
@@ -241,9 +241,9 @@ bool AccountImpl::IsHideStatus()
 	return Get(&AccountType::hidestatus);
 }
 
-void AccountImpl::SetHideStatus(bool hidestatus)
+void AccountImpl::SetHideStatus(bool h)
 {
-	Set(&AccountType::hidestatus, hidestatus);
+	Set(&AccountType::hidestatus, h);
 }
 
 bool AccountImpl::IsHideQuit()
@@ -251,9 +251,9 @@ bool AccountImpl::IsHideQuit()
 	return Get(&AccountType::hidequit);
 }
 
-void AccountImpl::SetHideQuit(bool hidequit)
+void AccountImpl::SetHideQuit(bool h)
 {
-	Set(&AccountType::hidequit, hidequit);
+	Set(&AccountType::hidequit, h);
 }
 
 void AccountImpl::SetDisplay(NickServ::Nick *na)
@@ -291,7 +291,7 @@ time_t AccountImpl::GetLastMail()
 	return Get(&AccountType::last_mail);
 }
 
-void AccountImpl::SetLastMail(time_t lastmail)
+void AccountImpl::SetLastMail(time_t l)
 {
-	Set(&AccountType::last_mail, lastmail);
+	Set(&AccountType::last_mail, l);
 }
diff --git a/modules/nickserv/main/nick.cpp b/modules/nickserv/main/nick.cpp
index cb1fa5d0b..4efaf5a45 100644
--- a/modules/nickserv/main/nick.cpp
+++ b/modules/nickserv/main/nick.cpp
@@ -61,9 +61,9 @@ Anope::string NickImpl::GetNick()
 	return Get<Anope::string>(&NickType::nick);
 }
 
-void NickImpl::SetNick(const Anope::string &nick)
+void NickImpl::SetNick(const Anope::string &n)
 {
-	Set(&NickType::nick, nick);
+	Set(&NickType::nick, n);
 }
 
 Anope::string NickImpl::GetLastQuit()
@@ -141,8 +141,8 @@ bool NickImpl::IsNoExpire()
 	return Get(&NickType::noexpire);
 }
 
-void NickImpl::SetNoExpire(bool noexpire)
+void NickImpl::SetNoExpire(bool n)
 {
-	Set(&NickType::noexpire, noexpire);
+	Set(&NickType::noexpire, n);
 }
 
diff --git a/modules/nickserv/register.cpp b/modules/nickserv/register.cpp
index 116d8d8df..ff24c08d1 100644
--- a/modules/nickserv/register.cpp
+++ b/modules/nickserv/register.cpp
@@ -192,8 +192,6 @@ class CommandNSRegister : public Command
 				}
 			}
 
-		unsigned int passlen = Config->GetModule("nickserv/main")->Get<unsigned>("passlen", "32");
-
 		if (Config->GetModule("nickserv/main")->Get<bool>("forceemail", "yes") && email.empty())
 		{
 			this->OnSyntaxError(source, "");
@@ -219,9 +217,10 @@ class CommandNSRegister : public Command
 			return;
 		}
 
-		if (pass.length() > Config->GetModule("nickserv/main")->Get<unsigned>("passlen", "32"))
+		unsigned int passlen = Config->GetModule("nickserv/main")->Get<unsigned>("passlen", "32");
+		if (pass.length() > passlen)
 		{
-			source.Reply(_("Your password is too long, it can not contain more than \002{0}\002 characters."), Config->GetModule("nickserv/main")->Get<unsigned>("passlen", "32"));
+			source.Reply(_("Your password is too long, it can not contain more than \002{0}\002 characters."), passlen);
 			return;
 		}
 
diff --git a/modules/nickserv/suspend.cpp b/modules/nickserv/suspend.cpp
index c87a8e864..bd60bc228 100644
--- a/modules/nickserv/suspend.cpp
+++ b/modules/nickserv/suspend.cpp
@@ -81,9 +81,9 @@ Anope::string NSSuspendInfoImpl::GetBy()
 	return Get(&NSSuspendType::by);
 }
 
-void NSSuspendInfoImpl::SetBy(const Anope::string &by)
+void NSSuspendInfoImpl::SetBy(const Anope::string &b)
 {
-	Set(&NSSuspendType::by, by);
+	Set(&NSSuspendType::by, b);
 }
 
 Anope::string NSSuspendInfoImpl::GetReason()
@@ -91,9 +91,9 @@ Anope::string NSSuspendInfoImpl::GetReason()
 	return Get(&NSSuspendType::reason);
 }
 
-void NSSuspendInfoImpl::SetReason(const Anope::string &reason)
+void NSSuspendInfoImpl::SetReason(const Anope::string &r)
 {
-	Set(&NSSuspendType::reason, reason);
+	Set(&NSSuspendType::reason, r);
 }
 
 time_t NSSuspendInfoImpl::GetWhen()
diff --git a/modules/operserv/dns.cpp b/modules/operserv/dns.cpp
index de22e0266..7ca4b0efa 100644
--- a/modules/operserv/dns.cpp
+++ b/modules/operserv/dns.cpp
@@ -60,9 +60,9 @@ Anope::string DNSZoneImpl::GetName()
 	return Get(&DNSZoneType::name);
 }
 
-void DNSZoneImpl::SetName(const Anope::string &name)
+void DNSZoneImpl::SetName(const Anope::string &n)
 {
-	Set(&DNSZoneType::name, name);
+	Set(&DNSZoneType::name, n);
 }
 
 class DNSServerImpl : public DNSServer
@@ -286,9 +286,9 @@ Anope::string DNSIPImpl::GetIP()
 	return Get(&DNSIPType::ip);
 }
 
-void DNSIPImpl::SetIP(const Anope::string &ip)
+void DNSIPImpl::SetIP(const Anope::string &i)
 {
-	Set(&DNSIPType::ip, ip);
+	Set(&DNSIPType::ip, i);
 }
 
 class CommandOSDNS : public Command
diff --git a/modules/operserv/info.cpp b/modules/operserv/info.cpp
index 1aec64d1e..f4785ed88 100644
--- a/modules/operserv/info.cpp
+++ b/modules/operserv/info.cpp
@@ -74,9 +74,9 @@ NickServ::Account *OperInfoImpl::GetAccount()
 	return Get(&OperInfoType::account);
 }
 
-void OperInfoImpl::SetAccount(NickServ::Account *account)
+void OperInfoImpl::SetAccount(NickServ::Account *acc)
 {
-	Set(&OperInfoType::account, account);
+	Set(&OperInfoType::account, acc);
 }
 
 ChanServ::Channel *OperInfoImpl::GetChannel()
@@ -84,9 +84,9 @@ ChanServ::Channel *OperInfoImpl::GetChannel()
 	return Get(&OperInfoType::channel);
 }
 
-void OperInfoImpl::SetChannel(ChanServ::Channel *channel)
+void OperInfoImpl::SetChannel(ChanServ::Channel *c)
 {
-	Set(&OperInfoType::channel, channel);
+	Set(&OperInfoType::channel, c);
 }
 
 Anope::string OperInfoImpl::GetInfo()
diff --git a/modules/protocol/bahamut.cpp b/modules/protocol/bahamut.cpp
index fa41ebc39..211570ccb 100644
--- a/modules/protocol/bahamut.cpp
+++ b/modules/protocol/bahamut.cpp
@@ -576,23 +576,11 @@ class ProtoBahamut : public Module
 		, message_sjoin(this)
 		, message_topic(this)
 
-		, sender_akill(this)
-		, sender_akill_del(this)
-		, sender_channel(this)
 		, sender_global_notice(this)
 		, sender_global_privmsg(this)
 		, sender_invite(this)
-		, sender_join(this)
 		, sender_kick(this)
-		, sender_kill(this)
-		, sender_login(this)
-		, sender_logout(this)
-		, sender_mode_channel(this)
-		, sender_mode_user(this)
 		, sender_nickchange(this)
-		, sender_nickintroduction(this)
-		, sender_noop(this)
-		, sender_topic(this)
 		, sender_notice(this)
 		, sender_part(this)
 		, sender_ping(this)
@@ -600,16 +588,29 @@ class ProtoBahamut : public Module
 		, sender_privmsg(this)
 		, sender_quit(this)
 		, sender_server(this)
+		, sender_squit(this)
+
+		, sender_akill(this)
+		, sender_akill_del(this)
+		, sender_channel(this)
+		, sender_join(this)
+		, sender_kill(this)
+		, sender_login(this)
+		, sender_logout(this)
+		, sender_mode_channel(this)
+		, sender_mode_user(this)
+		, sender_nickintroduction(this)
+		, sender_noop(this)
 		, sender_sgline(this)
 		, sender_sgline_del(this)
 		, sender_sqline(this)
 		, sender_sqline_del(this)
 		, sender_szline(this)
 		, sender_szline_del(this)
-		, sender_squit(this)
 		, sender_svshold(this)
 		, sender_svsholddel(this)
 		, sender_svsnick(this)
+		, sender_topic(this)
 		, sender_wallops(this)
 	{
 		IRCD = &ircd_proto;
diff --git a/modules/protocol/charybdis.cpp b/modules/protocol/charybdis.cpp
index adb8b0a54..862fdf44b 100644
--- a/modules/protocol/charybdis.cpp
+++ b/modules/protocol/charybdis.cpp
@@ -356,43 +356,46 @@ class ProtoCharybdis : public Module
 		, message_tmode(this)
 		, message_uid(this)
 
-		, sender_akill(this)
-		, sender_akill_del(this)
-		, sender_channel(this)
-		, sender_global_notice(this)
-		, sender_global_privmsg(this)
 		, sender_invite(this)
-		, sender_join(this)
 		, sender_kick(this)
 		, sender_svskill(this)
-		, sender_login(this)
-		, sender_logout(this)
 		, sender_mode_chan(this)
 		, sender_mode_user(this)
 		, sender_nickchange(this)
-		, sender_nickintroduction(this)
 		, sender_notice(this)
 		, sender_part(this)
 		, sender_ping(this)
 		, sender_pong(this)
 		, sender_privmsg(this)
 		, sender_quit(this)
+		, sender_squit(this)
+
+		, sender_akill(this)
+		, sender_akill_del(this)
+		, sender_channel(this)
+		, sender_global_notice(this)
+		, sender_global_privmsg(this)
+		, sender_join(this)
 		, sender_server(this)
-		, sender_sasl(this)
-		, sender_sasl_mechs(this)
 		, sender_sgline(this)
 		, sender_sgline_del(this)
-		, sender_sqline(this)
-		, sender_sqline_del(this)
-		, sender_squit(this)
 		, sender_svshold(this)
 		, sender_svsholddel(this)
-		, sender_svslogin(this)
+
+		, sender_login(this)
+		, sender_logout(this)
+		, sender_sqline(this)
+		, sender_sqline_del(this)
 		, sender_svsnick(this)
 		, sender_topic(this)
+		, sender_wallops(this)
+
+		, sender_nickintroduction(this)
+		, sender_sasl(this)
+		, sender_sasl_mechs(this)
+		, sender_svslogin(this)
 		, sender_vhost_del(this)
 		, sender_vhost_set(this)
-		, sender_wallops(this)
 	{
 		IRCD = &ircd_proto;
 	}
diff --git a/modules/protocol/hybrid.cpp b/modules/protocol/hybrid.cpp
index 23e5d279b..76cad6fd3 100644
--- a/modules/protocol/hybrid.cpp
+++ b/modules/protocol/hybrid.cpp
@@ -678,6 +678,8 @@ public:
 		, message_topic(this)
 		, message_version(this)
 		, message_whois(this)
+
+		, message_certfp(this)
 		, message_bmask(this)
 		, message_eob(this)
 		, message_join(this)
@@ -691,7 +693,18 @@ public:
 		, message_tburst(this)
 		, message_tmode(this)
 		, message_uid(this)
-		, message_certfp(this)
+
+		, sender_kick(this)
+		, sender_svskill(this)
+		, sender_mode_chan(this)
+		, sender_nickchange(this)
+		, sender_notice(this)
+		, sender_part(this)
+		, sender_ping(this)
+		, sender_pong(this)
+		, sender_privmsg(this)
+		, sender_quit(this)
+		, sender_squit(this)
 
 		, sender_akill(this)
 		, sender_akill_del(this)
@@ -700,20 +713,10 @@ public:
 		, sender_global_privmsg(this)
 		, sender_invite(this)
 		, sender_join(this)
-		, sender_kick(this)
-		, sender_svskill(this)
 		, sender_login(this)
 		, sender_logout(this)
-		, sender_mode_chan(this)
 		, sender_mode_user(this)
-		, sender_nickchange(this)
 		, sender_nickintroduction(this)
-		, sender_notice(this)
-		, sender_part(this)
-		, sender_ping(this)
-		, sender_pong(this)
-		, sender_privmsg(this)
-		, sender_quit(this)
 		, sender_server(this)
 		, sender_sgline(this)
 		, sender_sgline_del(this)
@@ -721,7 +724,6 @@ public:
 		, sender_sqline_del(this)
 		, sender_szline(this)
 		, sender_szline_del(this)
-		, sender_squit(this)
 		, sender_svshold(this)
 		, sender_svsholddel(this)
 		, sender_svsnick(this)
diff --git a/modules/protocol/inspircd20.cpp b/modules/protocol/inspircd20.cpp
index 6baebb34c..774d214c6 100644
--- a/modules/protocol/inspircd20.cpp
+++ b/modules/protocol/inspircd20.cpp
@@ -1404,26 +1404,27 @@ class ProtoInspIRCd20 : public Module
 		, message_time(this)
 		, message_uid(this)
 
-		, sender_akill(this, &ircd_proto)
-		, sender_akill_del(this, &ircd_proto)
-		, sender_channel(this)
 		, sender_global_notice(this)
 		, sender_global_privmsg(this)
 		, sender_invite(this)
 		, sender_kick(this)
 		, sender_svskill(this)
-		, sender_login(this)
-		, sender_logout(this)
 		, sender_mode_chan(this)
 		, sender_mode_user(this)
 		, sender_nickchange(this)
-		, sender_nickintroduction(this)
 		, sender_notice(this)
 		, sender_part(this)
 		, sender_ping(this)
 		, sender_pong(this)
 		, sender_privmsg(this)
+
 		, sender_quit(this)
+		, sender_akill(this, &ircd_proto)
+		, sender_akill_del(this, &ircd_proto)
+		, sender_channel(this)
+		, sender_login(this)
+		, sender_logout(this)
+		, sender_nickintroduction(this)
 		, sender_server(this)
 		, sender_sasl(this)
 		, sender_sasl_mechs(this)
diff --git a/modules/protocol/ngircd.cpp b/modules/protocol/ngircd.cpp
index e33df21bd..bbb594ff8 100644
--- a/modules/protocol/ngircd.cpp
+++ b/modules/protocol/ngircd.cpp
@@ -533,6 +533,7 @@ class ProtongIRCd : public Module
 		, message_squit(this)
 		, message_stats(this)
 		, message_time(this)
+		, message_topic(this)
 		, message_version(this)
 		, message_whois(this)
 
@@ -545,19 +546,13 @@ class ProtongIRCd : public Module
 		, message_njoin(this)
 		, message_pong(this)
 		, message_server(this)
-		, message_topic(this)
 
-		, sender_akill(this)
-		, sender_akill_del(this)
-		, sender_channel(this)
 		, sender_global_notice(this)
 		, sender_global_privmsg(this)
 		, sender_invite(this)
 		, sender_join(this)
 		, sender_kick(this)
 		, sender_svskill(this)
-		, sender_login(this)
-		, sender_logout(this)
 		, sender_mode_chan(this)
 		, sender_mode_user(this)
 		, sender_nickchange(this)
@@ -569,11 +564,17 @@ class ProtongIRCd : public Module
 		, sender_quit(this)
 		, sender_server(this)
 		, sender_squit(this)
-		, sender_svsnick(this)
 		, sender_topic(this)
+		, sender_wallops(this)
+
+		, sender_akill(this)
+		, sender_akill_del(this)
+		, sender_channel(this)
+		, sender_login(this)
+		, sender_logout(this)
+		, sender_svsnick(this)
 		, sender_vhost_del(this)
 		, sender_vhost_set(this)
-		, sender_wallops(this)
 	{
 		Servers::Capab.insert("QS");
 
diff --git a/modules/protocol/plexus.cpp b/modules/protocol/plexus.cpp
index 5743ef50e..a36f7f2c2 100644
--- a/modules/protocol/plexus.cpp
+++ b/modules/protocol/plexus.cpp
@@ -383,35 +383,39 @@ class ProtoPlexus : public Module
 		, message_tmode(this)
 		, message_uid(this)
 
-		, sender_akill(this)
-		, sender_akill_del(this)
-		, sender_channel(this)
-		, sender_global_notice(this)
-		, sender_global_privmsg(this)
 		, sender_invite(this)
-		, sender_join(this)
 		, sender_kick(this)
 		, sender_svskill(this)
-		, sender_login(this)
-		, sender_logout(this)
 		, sender_mode_chan(this)
-		, sender_mode_user(this)
 		, sender_nickchange(this)
-		, sender_nickintroduction(this)
-		, sender_noop(this)
-		, sender_sasl(this)
 		, sender_notice(this)
 		, sender_part(this)
 		, sender_ping(this)
 		, sender_pong(this)
 		, sender_privmsg(this)
 		, sender_quit(this)
+		, sender_squit(this)
+
+		, sender_akill(this)
+		, sender_akill_del(this)
+		, sender_channel(this)
+		, sender_global_notice(this)
+		, sender_global_privmsg(this)
+		, sender_join(this)
 		, sender_server(this)
 		, sender_sqline(this)
 		, sender_sqline_del(this)
-		, sender_squit(this)
 		, sender_svshold(this)
 		, sender_svsholddel(this)
+
+		, sender_login(this)
+		, sender_logout(this)
+		, sender_wallops(this)
+
+		, sender_mode_user(this)
+		, sender_nickintroduction(this)
+		, sender_noop(this)
+		, sender_sasl(this)
 		, sender_svsjoin(this)
 		, sender_svslogin(this)
 		, sender_svsnick(this)
@@ -419,7 +423,6 @@ class ProtoPlexus : public Module
 		, sender_topic(this)
 		, sender_vhost_del(this)
 		, sender_vhost_set(this)
-		, sender_wallops(this)
 	{
 		IRCD = &ircd_proto;
 	}
diff --git a/modules/protocol/ratbox.cpp b/modules/protocol/ratbox.cpp
index fcfca05dd..4541419b7 100644
--- a/modules/protocol/ratbox.cpp
+++ b/modules/protocol/ratbox.cpp
@@ -357,33 +357,35 @@ class ProtoRatbox : public Module
 		, message_tmode(this)
 		, message_uid(this)
 
-		, sender_akill(this)
-		, sender_akill_del(this)
-		, sender_channel(this)
-		, sender_global_notice(this)
-		, sender_global_privmsg(this)
 		, sender_invite(this)
-		, sender_join(this)
 		, sender_kick(this)
 		, sender_svskill(this)
-		, sender_login(this)
-		, sender_logout(this)
 		, sender_mode_chan(this)
-		, sender_mode_user(this)
 		, sender_nickchange(this)
-		, sender_nickintroduction(this)
 		, sender_notice(this)
 		, sender_part(this)
 		, sender_ping(this)
 		, sender_pong(this)
 		, sender_privmsg(this)
 		, sender_quit(this)
+		, sender_squit(this)
+
+		, sender_akill(this)
+		, sender_akill_del(this)
+		, sender_channel(this)
+		, sender_global_notice(this)
+		, sender_global_privmsg(this)
+		, sender_join(this)
+		, sender_mode_user(this)
 		, sender_server(this)
 		, sender_sgline(this)
 		, sender_sgline_del(this)
+
+		, sender_login(this)
+		, sender_logout(this)
+		, sender_nickintroduction(this)
 		, sender_sqline(this)
 		, sender_sqline_del(this)
-		, sender_squit(this)
 		, sender_svsnick(this)
 		, sender_topic(this)
 		, sender_wallops(this)
diff --git a/modules/protocol/rfc1459.cpp b/modules/protocol/rfc1459.cpp
index 77f3dedc3..4519447b3 100644
--- a/modules/protocol/rfc1459.cpp
+++ b/modules/protocol/rfc1459.cpp
@@ -505,7 +505,6 @@ void Privmsg::Run(MessageSource &source, const std::vector<Anope::string> &param
 				}
 				else if (message.substr(0, 9).equals_ci("\1VERSION\1"))
 				{
-					Module *enc = ModuleManager::FindFirstOf(ENCRYPTION);
 					IRCD->SendCTCPReply(bi, u->nick, "VERSION Anope-{0}", Anope::Version());
 				}
 				return;
diff --git a/modules/protocol/unreal.cpp b/modules/protocol/unreal.cpp
index 44a5d1a41..bf4a6a8a8 100644
--- a/modules/protocol/unreal.cpp
+++ b/modules/protocol/unreal.cpp
@@ -1207,39 +1207,41 @@ class ProtoUnreal : public Module
 		, message_uid(this)
 		, message_umode2(this)
 
-		, sender_akill(this)
-		, sender_akill_del(this)
-		, sender_channel(this)
 		, sender_global_notice(this)
 		, sender_global_privmsg(this)
 		, sender_invite(this)
-		, sender_join(this)
 		, sender_kick(this)
-		, sender_svskill(this)
-		, sender_login(this)
-		, sender_logout(this)
 		, sender_mode_chan(this)
-		, sender_mode_user(this)
 		, sender_nickchange(this)
-		, sender_nickintroduction(this)
-		, sender_noop(this)
 		, sender_notice(this)
 		, sender_part(this)
 		, sender_ping(this)
 		, sender_pong(this)
 		, sender_privmsg(this)
 		, sender_quit(this)
+		, sender_squit(this)
+
+		, sender_noop(this)
+		, sender_svsnick(this)
+
+		, sender_akill(this)
+		, sender_akill_del(this)
+		, sender_channel(this)
+		, sender_join(this)
+		, sender_svskill(this)
+		, sender_login(this)
+		, sender_logout(this)
+		, sender_mode_user(this)
+		, sender_nickintroduction(this)
 		, sender_server(this)
 		, sender_sasl(this)
 		, sender_sgline(this)
 		, sender_sgline_del(this)
 		, sender_sqline(this)
 		, sender_sqline_del(this)
-		, sender_squit(this)
 		, sender_svshold(this)
 		, sender_svsholddel(this)
 		, sender_svsjoin(this)
-		, sender_svsnick(this)
 		, sender_svspart(this)
 		, sender_swhois(this)
 		, sender_topic(this)