Changed subcommand parameter of Command's OnHelp() from std::string to ci::string, allows sub-help (like NS SET PASSWORD) to be called without requiring the subcommand to be sent by the user in all caps.

git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@2391 5417fbe8-f217-4b02-8779-1006273d7864

112 files changed, 155 insertions, 154 deletions

diff --git a/include/modules.h b/include/modules.h
index fe171179d..61eab28df 100644
--- a/include/modules.h
+++ b/include/modules.h
@@ -18,6 +18,7 @@
 #include "services.h"
 #include <stdio.h>
 #include "timers.h"
+#include "hashcomp.h"
 
 /* Cross OS compatibility macros */
 #ifdef _WIN32
@@ -255,7 +256,7 @@ class CoreExport Command
 	 * @param subcommand The subcommand the user is requesting help on, or an empty string. (e.g. /ns help set foo bar lol gives a subcommand of "FOO BAR LOL")
 	 * @return true if help was provided to the user, false otherwise.
 	 */
-	virtual bool OnHelp(User *u, const std::string &subcommand);
+	virtual bool OnHelp(User *u, const ci::string &subcommand);
 
 	/** Requested when the user provides bad syntax to this command (not enough params, etc).
 	 * @param u The user executing the command.
@@ -629,7 +630,7 @@ class CoreExport Module
 
 	/** Called before the database expire routines are called
 	* Note: Code that is in seperate expiry routines should just be done
-	* when we save the DB, theres no need to have both 
+	* when we save the DB, theres no need to have both
 	*/
 	virtual void OnPreDatabaseExpire() MARK_DEPRECATED { }
 
@@ -726,7 +727,7 @@ class CoreExport Module
 	 * @param chname The channel name
 	 */
 	virtual void OnChanDrop(const char *chname) { }
-	
+
 	/** Called when a channel is forbidden
 	 * @param ci The channel
 	 */
@@ -772,7 +773,7 @@ class CoreExport Module
 	 * @param u The user
 	 */
 	virtual void OnNickIdentify(User *u) { }
-	
+
 	/** Called when a nick logs out
 	 * @param u The nick
 	 */
@@ -787,7 +788,7 @@ class CoreExport Module
 	 * @param na The nick alias
 	 */
 	virtual void OnNickSuspend(NickAlias *na) { }
-	
+
 	/** Called when a nick is unsuspneded
 	 * @param na The nick alias
 	 */
@@ -866,7 +867,7 @@ enum Implementation
 		I_OnUserKicked, I_OnBotFantasy, I_OnBotNoFantasyAccess, I_OnBotBan,
 
 		/* Users */
-		I_OnUserConnect, I_OnUserNickChange, I_OnUserLogoff, I_OnPreJoinChannel, I_OnJoinChannel, 
+		I_OnUserConnect, I_OnUserNickChange, I_OnUserLogoff, I_OnPreJoinChannel, I_OnJoinChannel,
 		I_OnPrePartChannel, I_OnPartChannel,
 
 		/* OperServ */
diff --git a/src/command.cpp b/src/command.cpp
index 1718cb8a7..26b464483 100644
--- a/src/command.cpp
+++ b/src/command.cpp
@@ -36,7 +36,7 @@ Command::~Command()
 
 CommandReturn Command::Execute(User *u, std::vector<std::string> &) { return MOD_CONT; }
 
-bool Command::OnHelp(User *u, const std::string &subcommand) { return false; }
+bool Command::OnHelp(User *u, const ci::string &subcommand) { return false; }
 
 void Command::OnSyntaxError(User *u) { }
 
diff --git a/src/commands.c b/src/commands.c
index e9071141c..17f854a99 100644
--- a/src/commands.c
+++ b/src/commands.c
@@ -160,7 +160,7 @@ void mod_run_cmd(char *service, User * u, CommandHash * cmdTable[], const char *
 		}
 	}
 
-	// If the command requires a permission, and they aren't registered or don't have the required perm, DENIED 
+	// If the command requires a permission, and they aren't registered or don't have the required perm, DENIED
 	if (!c->permission.empty())
 	{
 		if (!u->nc->HasPriv(c->permission) && !u->nc->HasCommand(c->permission))
@@ -195,7 +195,7 @@ void mod_help_cmd(char *service, User * u, CommandHash * cmdTable[], const char
 
 	Command *c = findCommand(cmdTable, token.c_str());
 
-	std::string subcommand = tokens.StreamEnd() ? "" : tokens.GetRemaining();
+	ci::string subcommand = tokens.StreamEnd() ? "" : tokens.GetRemaining().c_str();
 
 	if (!c || !c->OnHelp(u, subcommand))
 		notice_lang(service, u, NO_HELP_AVAILABLE, cmd);
diff --git a/src/core/bs_act.c b/src/core/bs_act.c
index 780f08e78..21f18063b 100644
--- a/src/core/bs_act.c
+++ b/src/core/bs_act.c
@@ -50,7 +50,7 @@ class CommandBSAct : public Command
 		{
 			params[1].erase(i, 1);
 		}
-		
+
 		ircdproto->SendAction(ci->bi, ci->name, "%s", params[1].c_str());
 		ci->bi->lastmsg = time(NULL);
 		if (LogBot && LogChannel && logchan && !debug && findchan(LogChannel))
@@ -63,7 +63,7 @@ class CommandBSAct : public Command
 		syntax_error(s_BotServ, u, "ACT", BOT_ACT_SYNTAX);
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_BotServ, u, BOT_HELP_ACT);
 		return true;
diff --git a/src/core/bs_assign.c b/src/core/bs_assign.c
index aa8d30b9f..20c5e3bb4 100644
--- a/src/core/bs_assign.c
+++ b/src/core/bs_assign.c
@@ -66,7 +66,7 @@ class CommandBSAssign : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_BotServ, u, BOT_HELP_ASSIGN);
 		return true;
diff --git a/src/core/bs_badwords.c b/src/core/bs_badwords.c
index 190f5b510..bc22c0312 100644
--- a/src/core/bs_badwords.c
+++ b/src/core/bs_badwords.c
@@ -285,7 +285,7 @@ class CommandBSBadwords : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_BotServ, u, BOT_HELP_BADWORDS);
 		return true;
diff --git a/src/core/bs_bot.c b/src/core/bs_bot.c
index 96f72c336..787f5b131 100644
--- a/src/core/bs_bot.c
+++ b/src/core/bs_bot.c
@@ -425,7 +425,7 @@ class CommandBSBot : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_lang(s_BotServ, u, BOT_SERVADMIN_HELP_BOT);
 		return true;
diff --git a/src/core/bs_botlist.c b/src/core/bs_botlist.c
index e363c8545..5064642f6 100644
--- a/src/core/bs_botlist.c
+++ b/src/core/bs_botlist.c
@@ -63,7 +63,7 @@ class CommandBSBotList : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_BotServ, u, BOT_HELP_BOTLIST);
 		return true;
diff --git a/src/core/bs_info.c b/src/core/bs_info.c
index e43f264c9..cad350cb2 100644
--- a/src/core/bs_info.c
+++ b/src/core/bs_info.c
@@ -236,7 +236,7 @@ class CommandBSInfo : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_BotServ, u, BOT_HELP_INFO);
 		return true;
diff --git a/src/core/bs_kick.c b/src/core/bs_kick.c
index 7b6b153bf..372a4ef7f 100644
--- a/src/core/bs_kick.c
+++ b/src/core/bs_kick.c
@@ -308,7 +308,7 @@ class CommandBSKick : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		if (subcommand.empty())
 			notice_help(s_BotServ, u, BOT_HELP_KICK);
diff --git a/src/core/bs_say.c b/src/core/bs_say.c
index 5f9c766bf..6fd8f41c7 100644
--- a/src/core/bs_say.c
+++ b/src/core/bs_say.c
@@ -63,7 +63,7 @@ class CommandBSSay : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_BotServ, u, BOT_HELP_SAY);
 		return true;
diff --git a/src/core/bs_set.c b/src/core/bs_set.c
index 6e9458fb4..c68a11688 100644
--- a/src/core/bs_set.c
+++ b/src/core/bs_set.c
@@ -145,7 +145,7 @@ class CommandBSSet : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		if (subcommand.empty())
 		{
diff --git a/src/core/bs_unassign.c b/src/core/bs_unassign.c
index 52b28a078..83771fc9d 100644
--- a/src/core/bs_unassign.c
+++ b/src/core/bs_unassign.c
@@ -42,7 +42,7 @@ class CommandBSUnassign : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_BotServ, u, BOT_HELP_UNASSIGN);
 		return true;
diff --git a/src/core/cs_access.c b/src/core/cs_access.c
index 54f5ff5f8..c2b5d93f2 100644
--- a/src/core/cs_access.c
+++ b/src/core/cs_access.c
@@ -196,7 +196,7 @@ class CommandCSAccess : public Command
 			ci->AddAccess(nc, level);
 
 			FOREACH_MOD(I_OnAccessAdd, OnAccessAdd(ci, u, na->nick, level));
-			
+
 			alog("%s: %s!%s@%s (level %d) set access level %d to %s (group %s) on channel %s", s_ChanServ, u->nick, u->GetIdent().c_str(), u->host, ulev, level, na->nick, nc->display, ci->name);
 			notice_lang(s_ChanServ, u, CHAN_ACCESS_ADDED, nc->display, ci->name, level);
 		}
@@ -336,7 +336,7 @@ class CommandCSAccess : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_ChanServ, u, CHAN_HELP_ACCESS);
 		notice_help(s_ChanServ, u, CHAN_HELP_ACCESS_LEVELS);
@@ -470,7 +470,7 @@ class CommandCSLevels : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_ChanServ, u, CHAN_HELP_LEVELS);
 		return true;
diff --git a/src/core/cs_akick.c b/src/core/cs_akick.c
index ef09befbf..d396d0386 100644
--- a/src/core/cs_akick.c
+++ b/src/core/cs_akick.c
@@ -647,7 +647,7 @@ class CommandCSAKick : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_ChanServ, u, CHAN_HELP_AKICK);
 		return true;
diff --git a/src/core/cs_ban.c b/src/core/cs_ban.c
index 277834571..d69b0540c 100644
--- a/src/core/cs_ban.c
+++ b/src/core/cs_ban.c
@@ -100,7 +100,7 @@ class CommandCSBan : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_ChanServ, u, CHAN_HELP_BAN);
 		return true;
@@ -147,7 +147,7 @@ class CommandCSUnban : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_ChanServ, u, CHAN_HELP_UNBAN);
 		return true;
diff --git a/src/core/cs_clear.c b/src/core/cs_clear.c
index e7e54867f..6aee7a93d 100644
--- a/src/core/cs_clear.c
+++ b/src/core/cs_clear.c
@@ -326,7 +326,7 @@ class CommandCSClear : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_ChanServ, u, CHAN_HELP_CLEAR);
 		return true;
diff --git a/src/core/cs_drop.c b/src/core/cs_drop.c
index b2e58f4c8..fcf7a9a80 100644
--- a/src/core/cs_drop.c
+++ b/src/core/cs_drop.c
@@ -92,7 +92,7 @@ class CommandCSDrop : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		if (u->nc && u->nc->IsServicesOper())
 			notice_help(s_ChanServ, u, CHAN_SERVADMIN_HELP_DROP);
diff --git a/src/core/cs_forbid.c b/src/core/cs_forbid.c
index 86b6aab54..5e834462c 100644
--- a/src/core/cs_forbid.c
+++ b/src/core/cs_forbid.c
@@ -102,13 +102,13 @@ class CommandCSForbid : public Command
 
 		alog("%s: %s set FORBID for channel %s", s_ChanServ, u->nick, ci->name);
 		notice_lang(s_ChanServ, u, CHAN_FORBID_SUCCEEDED, chan);
-		
+
 		FOREACH_MOD(I_OnChanForbidden, OnChanForbidden(ci));
 
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_ChanServ, u, CHAN_SERVADMIN_HELP_FORBID);
 		return true;
diff --git a/src/core/cs_getkey.c b/src/core/cs_getkey.c
index 52ad1ef2c..a5be26419 100644
--- a/src/core/cs_getkey.c
+++ b/src/core/cs_getkey.c
@@ -46,7 +46,7 @@ class CommandCSGetKey : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_ChanServ, u, CHAN_HELP_GETKEY);
 		return true;
diff --git a/src/core/cs_getpass.c b/src/core/cs_getpass.c
index a4f2fa9c9..5f6cd7652 100644
--- a/src/core/cs_getpass.c
+++ b/src/core/cs_getpass.c
@@ -30,7 +30,7 @@ class CommandCSGetPass : public Command
 		ChannelInfo *ci;
 
 		ci = cs_findchan(chan);
-		
+
 		if (!enc_decrypt(ci->founderpass, tmp_pass, PASSMAX - 1))
 		{
 			notice_lang(s_ChanServ, u, CHAN_GETPASS_UNAVAILABLE);
@@ -46,7 +46,7 @@ class CommandCSGetPass : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_ChanServ, u, CHAN_SERVADMIN_HELP_GETPASS);
 		return true;
diff --git a/src/core/cs_identify.c b/src/core/cs_identify.c
index 14de4134a..621446703 100644
--- a/src/core/cs_identify.c
+++ b/src/core/cs_identify.c
@@ -73,7 +73,7 @@ class CommandCSIdentify : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_ChanServ, u, CHAN_HELP_IDENTIFY);
 		return true;
diff --git a/src/core/cs_info.c b/src/core/cs_info.c
index 8778d002e..f33e74c79 100644
--- a/src/core/cs_info.c
+++ b/src/core/cs_info.c
@@ -143,7 +143,7 @@ class CommandCSInfo : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_lang(s_ChanServ, u, CHAN_HELP_INFO);
 		if (u->nc && u->nc->IsServicesOper())
diff --git a/src/core/cs_invite.c b/src/core/cs_invite.c
index 1c6ac1f93..cfaedd3d8 100644
--- a/src/core/cs_invite.c
+++ b/src/core/cs_invite.c
@@ -52,7 +52,7 @@ class CommandCSInvite : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_ChanServ, u, CHAN_HELP_INVITE);
 		return true;
diff --git a/src/core/cs_kick.c b/src/core/cs_kick.c
index f7049593d..5cbe007a0 100644
--- a/src/core/cs_kick.c
+++ b/src/core/cs_kick.c
@@ -82,7 +82,7 @@ class CommandCSKick : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_ChanServ, u, CHAN_HELP_KICK);
 		return true;
diff --git a/src/core/cs_list.c b/src/core/cs_list.c
index 793490755..dcb2ca1bc 100644
--- a/src/core/cs_list.c
+++ b/src/core/cs_list.c
@@ -165,7 +165,7 @@ public:
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_ChanServ, u, CHAN_HELP_LIST);
 		return true;
diff --git a/src/core/cs_logout.c b/src/core/cs_logout.c
index 948d32bcb..46483b0f7 100644
--- a/src/core/cs_logout.c
+++ b/src/core/cs_logout.c
@@ -93,7 +93,7 @@ class CommandCSLogout : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		if (u->nc && u->nc->HasCommand("chanserv/logout"))
 			notice_help(s_NickServ, u, CHAN_SERVADMIN_HELP_LOGOUT);
diff --git a/src/core/cs_modes.c b/src/core/cs_modes.c
index 239b31305..e71031d28 100644
--- a/src/core/cs_modes.c
+++ b/src/core/cs_modes.c
@@ -79,7 +79,7 @@ class CommandCSOp : public Command
 		return do_util(u, &csmodeutils[MUT_OP], (params.size() > 0 ? params[0].c_str() : NULL), (params.size() > 1 ? params[1].c_str() : NULL));
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_ChanServ, u, CHAN_HELP_OP);
 		return true;
@@ -105,7 +105,7 @@ class CommandCSDeOp : public Command
 		return do_util(u, &csmodeutils[MUT_DEOP], (params.size() > 0 ? params[0].c_str() : NULL), (params.size() > 1 ? params[1].c_str() : NULL));
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_ChanServ, u, CHAN_HELP_DEOP);
 		return true;
@@ -131,7 +131,7 @@ class CommandCSVoice : public Command
 		return do_util(u, &csmodeutils[MUT_VOICE], (params.size() > 0 ? params[0].c_str() : NULL), (params.size() > 1 ? params[1].c_str() : NULL));
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_ChanServ, u, CHAN_HELP_VOICE);
 		return true;
@@ -157,7 +157,7 @@ class CommandCSDeVoice : public Command
 		return do_util(u, &csmodeutils[MUT_DEVOICE], (params.size() > 0 ? params[0].c_str() : NULL), (params.size() > 1 ? params[1].c_str() : NULL));
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_ChanServ, u, CHAN_HELP_DEVOICE);
 		return true;
@@ -189,7 +189,7 @@ class CommandCSHalfOp : public Command
 		return do_util(u, &csmodeutils[MUT_HALFOP], (params.size() > 0 ? params[0].c_str() : NULL), (params.size() > 1 ? params[1].c_str() : NULL));
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_ChanServ, u, CHAN_HELP_HALFOP);
 		return true;
@@ -220,7 +220,7 @@ class CommandCSDeHalfOp : public Command
 		return do_util(u, &csmodeutils[MUT_DEHALFOP], (params.size() > 0 ? params[0].c_str() : NULL), (params.size() > 1 ? params[1].c_str() : NULL));
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_ChanServ, u, CHAN_HELP_DEHALFOP);
 		return true;
@@ -251,7 +251,7 @@ class CommandCSProtect : public Command
 		return do_util(u, &csmodeutils[MUT_PROTECT], (params.size() > 0 ? params[0].c_str() : NULL), (params.size() > 1 ? params[1].c_str() : NULL));
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_ChanServ, u, CHAN_HELP_PROTECT);
 		return true;
@@ -283,7 +283,7 @@ class CommandCSDeProtect : public Command
 		return do_util(u, &csmodeutils[MUT_DEPROTECT], (params.size() > 0 ? params[0].c_str() : NULL), (params.size() > 1 ? params[1].c_str() : NULL));
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_ChanServ, u, CHAN_HELP_DEPROTECT);
 		return true;
@@ -310,7 +310,7 @@ class CommandCSOwner : public Command
 		return do_util(u, &csmodeutils[MUT_OWNER], (params.size() > 0 ? params[0].c_str() : NULL), NULL);
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_ChanServ, u, CHAN_HELP_OWNER);
 		return true;
@@ -337,7 +337,7 @@ class CommandCSDeOwner : public Command
 		return do_util(u, &csmodeutils[MUT_DEOWNER], (params.size() > 0 ? params[0].c_str() : NULL), NULL);
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_ChanServ, u, CHAN_HELP_DEOWNER);
 		return true;
diff --git a/src/core/cs_register.c b/src/core/cs_register.c
index 089f6a785..4cb2c0d1e 100644
--- a/src/core/cs_register.c
+++ b/src/core/cs_register.c
@@ -121,13 +121,13 @@ class CommandCSRegister : public Command
 				ircdproto->SendMode(findbot(s_ChanServ), chan, "%s %s", ircd->adminset, u->nick);
 			if (ircd->owner && ircd->ownerset)
 				ircdproto->SendMode(findbot(s_ChanServ), chan, "%s %s", ircd->ownerset, u->nick);
-			
+
 			FOREACH_MOD(I_OnChanRegistered, OnChanRegistered(ci));
 		}
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_ChanServ, u, CHAN_HELP_REGISTER, s_ChanServ);
 		return true;
diff --git a/src/core/cs_sendpass.c b/src/core/cs_sendpass.c
index d9821b34d..3e75653b2 100644
--- a/src/core/cs_sendpass.c
+++ b/src/core/cs_sendpass.c
@@ -70,7 +70,7 @@ class CommandCSSendPass : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_ChanServ, u, CHAN_HELP_SENDPASS);
 		return true;
diff --git a/src/core/cs_set.c b/src/core/cs_set.c
index 0c7fade4f..e44bfd7d3 100644
--- a/src/core/cs_set.c
+++ b/src/core/cs_set.c
@@ -660,7 +660,7 @@ class CommandCSSet : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		if (subcommand.empty())
 		{
diff --git a/src/core/cs_status.c b/src/core/cs_status.c
index fdebc2b7f..80cd223d6 100644
--- a/src/core/cs_status.c
+++ b/src/core/cs_status.c
@@ -46,7 +46,7 @@ class CommandCSStatus : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_ChanServ, u, CHAN_SERVADMIN_HELP_STATUS);
 		return true;
diff --git a/src/core/cs_suspend.c b/src/core/cs_suspend.c
index 2f6662d8b..8ab2fa077 100644
--- a/src/core/cs_suspend.c
+++ b/src/core/cs_suspend.c
@@ -96,7 +96,7 @@ class CommandCSSuspend : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_ChanServ, u, CHAN_SERVADMIN_HELP_SUSPEND);
 		return true;
@@ -166,7 +166,7 @@ class CommandCSUnSuspend : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_ChanServ, u, CHAN_SERVADMIN_HELP_UNSUSPEND);
 		return true;
diff --git a/src/core/cs_topic.c b/src/core/cs_topic.c
index 4c981cb47..6f3c05390 100644
--- a/src/core/cs_topic.c
+++ b/src/core/cs_topic.c
@@ -68,7 +68,7 @@ class CommandCSTopic : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_ChanServ, u, CHAN_HELP_TOPIC);
 		return true;
diff --git a/src/core/cs_xop.c b/src/core/cs_xop.c
index 3ac2c4596..84687d79e 100644
--- a/src/core/cs_xop.c
+++ b/src/core/cs_xop.c
@@ -387,7 +387,7 @@ class XOPBase : public Command
 
 	virtual CommandReturn Execute(User *u, std::vector<std::string> &params) = 0;
 
-	virtual bool OnHelp(User *u, const std::string &subcommand) = 0;
+	virtual bool OnHelp(User *u, const ci::string &subcommand) = 0;
 
 	virtual void OnSyntaxError(User *u) = 0;
 };
@@ -404,7 +404,7 @@ class CommandCSAOP : public XOPBase
 		return this->DoXop(u, params, ACCESS_AOP, xop_msgs[XOP_AOP]);
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_ChanServ, u, CHAN_HELP_AOP);
 		return true;
@@ -428,7 +428,7 @@ class CommandCSHOP : public XOPBase
 		return this->DoXop(u, params, ACCESS_HOP, xop_msgs[XOP_HOP]);
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_ChanServ, u, CHAN_HELP_HOP);
 		return true;
@@ -452,7 +452,7 @@ class CommandCSSOP : public XOPBase
 		return this->DoXop(u, params, ACCESS_SOP, xop_msgs[XOP_SOP]);
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_ChanServ, u, CHAN_HELP_SOP);
 		return true;
@@ -476,7 +476,7 @@ class CommandCSVOP : public XOPBase
 		return this->DoXop(u, params, ACCESS_VOP, xop_msgs[XOP_VOP]);
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_ChanServ, u, CHAN_HELP_VOP);
 		return true;
diff --git a/src/core/hs_del.c b/src/core/hs_del.c
index b318b18ba..75f41b56d 100644
--- a/src/core/hs_del.c
+++ b/src/core/hs_del.c
@@ -42,7 +42,7 @@ class CommandHSDel : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_HostServ, u, HOST_HELP_DEL);
 		return true;
diff --git a/src/core/hs_delall.c b/src/core/hs_delall.c
index d75da38a8..8381c686c 100644
--- a/src/core/hs_delall.c
+++ b/src/core/hs_delall.c
@@ -49,7 +49,7 @@ class CommandHSDelAll : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_HostServ, u, HOST_HELP_DELALL);
 		return true;
diff --git a/src/core/hs_group.c b/src/core/hs_group.c
index 573f1be66..202f09d26 100644
--- a/src/core/hs_group.c
+++ b/src/core/hs_group.c
@@ -76,7 +76,7 @@ class CommandHSGroup : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_HostServ, u, HOST_HELP_GROUP);
 		return true;
diff --git a/src/core/hs_list.c b/src/core/hs_list.c
index 51d81bfd6..d68477865 100644
--- a/src/core/hs_list.c
+++ b/src/core/hs_list.c
@@ -135,7 +135,7 @@ class CommandHSList : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_HostServ, u, HOST_HELP_LIST);
 		return true;
diff --git a/src/core/hs_off.c b/src/core/hs_off.c
index 18bf25857..6acf9d096 100644
--- a/src/core/hs_off.c
+++ b/src/core/hs_off.c
@@ -46,7 +46,7 @@ class CommandHSOff : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_HostServ, u, HOST_HELP_OFF);
 		return true;
diff --git a/src/core/hs_on.c b/src/core/hs_on.c
index 8255150da..e946aba18 100644
--- a/src/core/hs_on.c
+++ b/src/core/hs_on.c
@@ -60,7 +60,7 @@ class CommandHSOn : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_HostServ, u, HOST_HELP_ON);
 		return true;
diff --git a/src/core/hs_set.c b/src/core/hs_set.c
index d3ac291db..025bbc044 100644
--- a/src/core/hs_set.c
+++ b/src/core/hs_set.c
@@ -139,7 +139,7 @@ class CommandHSSet : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_HostServ, u, HOST_HELP_SET);
 		return true;
diff --git a/src/core/hs_setall.c b/src/core/hs_setall.c
index 137e665ef..77c10fb37 100644
--- a/src/core/hs_setall.c
+++ b/src/core/hs_setall.c
@@ -140,7 +140,7 @@ class CommandHSSetAll : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_HostServ, u, HOST_HELP_SETALL);
 		return true;
diff --git a/src/core/ms_cancel.c b/src/core/ms_cancel.c
index 0991303dc..076501183 100644
--- a/src/core/ms_cancel.c
+++ b/src/core/ms_cancel.c
@@ -59,7 +59,7 @@ class CommandMSCancel : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_MemoServ, u, MEMO_HELP_CANCEL);
 		return true;
diff --git a/src/core/ms_check.c b/src/core/ms_check.c
index cfb331709..cdb6944d7 100644
--- a/src/core/ms_check.c
+++ b/src/core/ms_check.c
@@ -76,7 +76,7 @@ class CommandMSCheck : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_MemoServ, u, MEMO_HELP_CHECK);
 		return true;
diff --git a/src/core/ms_del.c b/src/core/ms_del.c
index 4e8e619cc..6a7506aa2 100644
--- a/src/core/ms_del.c
+++ b/src/core/ms_del.c
@@ -132,7 +132,7 @@ class CommandMSDel : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_MemoServ, u, MEMO_HELP_DEL);
 		return true;
diff --git a/src/core/ms_info.c b/src/core/ms_info.c
index 2b1880157..a72523679 100644
--- a/src/core/ms_info.c
+++ b/src/core/ms_info.c
@@ -66,7 +66,7 @@ class CommandMSInfo : public Command
 			notice_lang(s_MemoServ, u, ACCESS_DENIED);
 			return MOD_CONT;
 		}
-		else 
+		else
 		{
 			mi = &u->nc->memos;
 			hardmax = u->nc->flags & NI_MEMO_HARDMAX ? 1 : 0;
@@ -190,7 +190,7 @@ class CommandMSInfo : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		if (u->nc && u->nc->IsServicesOper())
 			notice_help(s_MemoServ, u, MEMO_SERVADMIN_HELP_INFO);
diff --git a/src/core/ms_list.c b/src/core/ms_list.c
index c59de4365..8506f53a0 100644
--- a/src/core/ms_list.c
+++ b/src/core/ms_list.c
@@ -98,7 +98,7 @@ class CommandMSList : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_MemoServ, u, MEMO_HELP_LIST);
 		return true;
diff --git a/src/core/ms_read.c b/src/core/ms_read.c
index 6020e8c97..4335565da 100644
--- a/src/core/ms_read.c
+++ b/src/core/ms_read.c
@@ -105,7 +105,7 @@ class CommandMSRead : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_MemoServ, u, MEMO_HELP_READ);
 		return true;
diff --git a/src/core/ms_rsend.c b/src/core/ms_rsend.c
index 999a2f4bd..afec57bbc 100644
--- a/src/core/ms_rsend.c
+++ b/src/core/ms_rsend.c
@@ -66,7 +66,7 @@ class CommandMSRSend : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_MemoServ, u, MEMO_HELP_RSEND);
 		return true;
diff --git a/src/core/ms_send.c b/src/core/ms_send.c
index 9c9db1c7a..edb919fa5 100644
--- a/src/core/ms_send.c
+++ b/src/core/ms_send.c
@@ -31,7 +31,7 @@ class CommandMSSend : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_MemoServ, u, MEMO_HELP_SEND);
 		return true;
diff --git a/src/core/ms_sendall.c b/src/core/ms_sendall.c
index 770cc9d67..40deef419 100644
--- a/src/core/ms_sendall.c
+++ b/src/core/ms_sendall.c
@@ -52,7 +52,7 @@ class CommandMSSendAll : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_MemoServ, u, MEMO_HELP_SENDALL);
 		return true;
diff --git a/src/core/ms_set.c b/src/core/ms_set.c
index 510930c15..48d871ed3 100644
--- a/src/core/ms_set.c
+++ b/src/core/ms_set.c
@@ -227,7 +227,7 @@ class CommandMSSet : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		if (subcommand.empty())
 			notice_help(s_MemoServ, u, MEMO_HELP_SET);
diff --git a/src/core/ms_staff.c b/src/core/ms_staff.c
index 151e0812b..61a6483d8 100644
--- a/src/core/ms_staff.c
+++ b/src/core/ms_staff.c
@@ -50,7 +50,7 @@ class CommandMSStaff : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_MemoServ, u, MEMO_HELP_STAFF);
 		return true;
diff --git a/src/core/ns_access.c b/src/core/ns_access.c
index 7e5b638ac..c03b982fc 100644
--- a/src/core/ns_access.c
+++ b/src/core/ns_access.c
@@ -159,7 +159,7 @@ class CommandNSAccess : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_NickServ, u, NICK_HELP_ACCESS);
 		return true;
diff --git a/src/core/ns_alist.c b/src/core/ns_alist.c
index 6e794d233..e97a4f61d 100644
--- a/src/core/ns_alist.c
+++ b/src/core/ns_alist.c
@@ -130,7 +130,7 @@ class CommandNSAList : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		if (u->nc && u->nc->IsServicesOper())
 			notice_help(s_NickServ, u, NICK_SERVADMIN_HELP_ALIST);
diff --git a/src/core/ns_drop.c b/src/core/ns_drop.c
index f53142211..f79b1168d 100644
--- a/src/core/ns_drop.c
+++ b/src/core/ns_drop.c
@@ -96,7 +96,7 @@ class CommandNSDrop : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		if (u->nc && u->nc->IsServicesOper())
 			notice_help(s_NickServ, u, NICK_SERVADMIN_HELP_DROP);
diff --git a/src/core/ns_forbid.c b/src/core/ns_forbid.c
index 8525d9c37..85b551275 100644
--- a/src/core/ns_forbid.c
+++ b/src/core/ns_forbid.c
@@ -88,7 +88,7 @@ class CommandNSForbid : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_NickServ, u, NICK_SERVADMIN_HELP_FORBID);
 		return true;
diff --git a/src/core/ns_getemail.c b/src/core/ns_getemail.c
index 7194e1407..618600325 100644
--- a/src/core/ns_getemail.c
+++ b/src/core/ns_getemail.c
@@ -56,7 +56,7 @@ class CommandNSGetEMail : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_NickServ, u, NICK_SERVADMIN_HELP_GETEMAIL);
 		return true;
diff --git a/src/core/ns_getpass.c b/src/core/ns_getpass.c
index 8bb28ae74..0e4057b0f 100644
--- a/src/core/ns_getpass.c
+++ b/src/core/ns_getpass.c
@@ -60,7 +60,7 @@ class CommandNSGetPass : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_NickServ, u, NICK_SERVADMIN_HELP_GETPASS);
 		return true;
diff --git a/src/core/ns_ghost.c b/src/core/ns_ghost.c
index 35d6f1a67..f1f0cafe1 100644
--- a/src/core/ns_ghost.c
+++ b/src/core/ns_ghost.c
@@ -74,7 +74,7 @@ class CommandNSGhost : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_NickServ, u, NICK_HELP_GHOST);
 		return true;
diff --git a/src/core/ns_group.c b/src/core/ns_group.c
index 6439b2a21..d5bd16770 100644
--- a/src/core/ns_group.c
+++ b/src/core/ns_group.c
@@ -158,7 +158,7 @@ class CommandNSGroup : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_NickServ, u, NICK_HELP_GROUP);
 		return true;
@@ -218,7 +218,7 @@ class CommandNSGList : public Command
 	}
 
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		if (u->nc && u->nc->IsServicesOper())
 			notice_help(s_NickServ, u, NICK_SERVADMIN_HELP_GLIST);
diff --git a/src/core/ns_identify.c b/src/core/ns_identify.c
index 526e40ca4..30fd7a906 100644
--- a/src/core/ns_identify.c
+++ b/src/core/ns_identify.c
@@ -112,7 +112,7 @@ class CommandNSIdentify : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_NickServ, u, NICK_HELP_IDENTIFY);
 		return true;
diff --git a/src/core/ns_info.c b/src/core/ns_info.c
index f000f5bfb..83242de89 100644
--- a/src/core/ns_info.c
+++ b/src/core/ns_info.c
@@ -193,7 +193,7 @@ class CommandNSInfo : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		if (u->nc && u->nc->IsServicesOper())
 			notice_help(s_NickServ, u, NICK_SERVADMIN_HELP_INFO);
diff --git a/src/core/ns_list.c b/src/core/ns_list.c
index 8248b173c..b9db35576 100644
--- a/src/core/ns_list.c
+++ b/src/core/ns_list.c
@@ -190,7 +190,7 @@ class CommandNSList : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		if (u->nc && u->nc->IsServicesOper())
 			notice_help(s_NickServ, u, NICK_SERVADMIN_HELP_LIST);
diff --git a/src/core/ns_logout.c b/src/core/ns_logout.c
index f51a553d1..a7652b1e6 100644
--- a/src/core/ns_logout.c
+++ b/src/core/ns_logout.c
@@ -93,7 +93,7 @@ class CommandNSLogout : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		if (u->nc && u->nc->IsServicesOper())
 			notice_help(s_NickServ, u, NICK_SERVADMIN_HELP_LOGOUT);
diff --git a/src/core/ns_recover.c b/src/core/ns_recover.c
index 898f55d48..0b851cdc8 100644
--- a/src/core/ns_recover.c
+++ b/src/core/ns_recover.c
@@ -86,7 +86,7 @@ class CommandNSRecover : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		char relstr[192];
 
diff --git a/src/core/ns_register.c b/src/core/ns_register.c
index 516aa15c0..6bee5b809 100644
--- a/src/core/ns_register.c
+++ b/src/core/ns_register.c
@@ -183,7 +183,7 @@ class CommandNSConfirm : public Command
 		return this->DoConfirm(u, params);
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_NickServ, u, NICK_HELP_CONFIRM);
 		return true;
@@ -331,7 +331,7 @@ class CommandNSRegister : public CommandNSConfirm
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_NickServ, u, NICK_HELP_REGISTER);
 		return true;
@@ -382,7 +382,7 @@ class CommandNSResend : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_NickServ, u, NICK_HELP_RESEND);
 		return true;
diff --git a/src/core/ns_release.c b/src/core/ns_release.c
index 3603e9976..4da37a662 100644
--- a/src/core/ns_release.c
+++ b/src/core/ns_release.c
@@ -68,7 +68,7 @@ class CommandNSRelease : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		char relstr[192];
 
diff --git a/src/core/ns_saset.c b/src/core/ns_saset.c
index ac7dac5cc..4be6b3af9 100644
--- a/src/core/ns_saset.c
+++ b/src/core/ns_saset.c
@@ -531,7 +531,7 @@ public:
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		if (subcommand.empty())
 			notice_help(s_NickServ, u, NICK_HELP_SASET);
diff --git a/src/core/ns_sendpass.c b/src/core/ns_sendpass.c
index 71612279a..fdb71b9b4 100644
--- a/src/core/ns_sendpass.c
+++ b/src/core/ns_sendpass.c
@@ -71,7 +71,7 @@ class CommandNSSendPass : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_NickServ, u, NICK_HELP_SENDPASS);
 		return true;
diff --git a/src/core/ns_set.c b/src/core/ns_set.c
index ac48c7bb6..7492810a3 100644
--- a/src/core/ns_set.c
+++ b/src/core/ns_set.c
@@ -491,7 +491,7 @@ class CommandNSSet : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		if (subcommand.empty())
 			notice_help(s_NickServ, u, NICK_HELP_SET);
diff --git a/src/core/ns_status.c b/src/core/ns_status.c
index 434840ddf..a8b57c39b 100644
--- a/src/core/ns_status.c
+++ b/src/core/ns_status.c
@@ -54,7 +54,7 @@ class CommandNSStatus : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_NickServ, u, NICK_HELP_STATUS);
 		return true;
diff --git a/src/core/ns_suspend.c b/src/core/ns_suspend.c
index 428f6226c..06e752e14 100644
--- a/src/core/ns_suspend.c
+++ b/src/core/ns_suspend.c
@@ -82,7 +82,7 @@ class CommandNSSuspend : public Command
 
 			alog("%s: %s set SUSPEND for nick %s", s_NickServ, u->nick, nick);
 			notice_lang(s_NickServ, u, NICK_SUSPEND_SUCCEEDED, nick);
-			
+
 			FOREACH_MOD(I_OnNickSuspended, OnNickSuspend(na))
 		}
 		else
@@ -93,7 +93,7 @@ class CommandNSSuspend : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_NickServ, u, NICK_SERVADMIN_HELP_SUSPEND);
 		return true;
@@ -150,7 +150,7 @@ class CommandNSUnSuspend : public Command
 
 			alog("%s: %s set UNSUSPEND for nick %s", s_NickServ, u->nick, nick);
 			notice_lang(s_NickServ, u, NICK_UNSUSPEND_SUCCEEDED, nick);
-			
+
 			FOREACH_MOD(I_OnNickUnsuspended, OnNickUnsuspended(na));
 		}
 		else
@@ -161,7 +161,7 @@ class CommandNSUnSuspend : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_NickServ, u, NICK_SERVADMIN_HELP_UNSUSPEND);
 		return true;
diff --git a/src/core/ns_update.c b/src/core/ns_update.c
index c039fd26b..4edf2b634 100644
--- a/src/core/ns_update.c
+++ b/src/core/ns_update.c
@@ -45,7 +45,7 @@ class CommandNSUpdate : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &)
+	bool OnHelp(User *u, const ci::string &)
 	{
 		notice_help(s_NickServ, u, NICK_HELP_UPDATE);
 		return true;
diff --git a/src/core/os_akill.c b/src/core/os_akill.c
index ee699aa5e..0b426ce3f 100644
--- a/src/core/os_akill.c
+++ b/src/core/os_akill.c
@@ -309,7 +309,7 @@ class CommandOSAKill : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_OperServ, u, OPER_HELP_AKILL);
 		return true;
diff --git a/src/core/os_chankill.c b/src/core/os_chankill.c
index fa3cc00a6..e620eb9bc 100644
--- a/src/core/os_chankill.c
+++ b/src/core/os_chankill.c
@@ -88,7 +88,7 @@ class CommandOSChanKill : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_OperServ, u, OPER_HELP_CHANKILL);
 		return true;
diff --git a/src/core/os_chanlist.c b/src/core/os_chanlist.c
index 77bc01edb..e87fa8d7c 100644
--- a/src/core/os_chanlist.c
+++ b/src/core/os_chanlist.c
@@ -70,7 +70,7 @@ class CommandOSChanList : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_OperServ, u, OPER_HELP_CHANLIST);
 		return true;
diff --git a/src/core/os_clearmodes.c b/src/core/os_clearmodes.c
index 942e9be6d..5a0250f31 100644
--- a/src/core/os_clearmodes.c
+++ b/src/core/os_clearmodes.c
@@ -231,7 +231,7 @@ class CommandOSClearModes : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_OperServ, u, OPER_HELP_CLEARMODES);
 		return true;
diff --git a/src/core/os_defcon.c b/src/core/os_defcon.c
index dfec49a68..8879ed2f7 100644
--- a/src/core/os_defcon.c
+++ b/src/core/os_defcon.c
@@ -76,7 +76,7 @@ class CommandOSDEFCON : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_OperServ, u, OPER_HELP_DEFCON);
 		return true;
diff --git a/src/core/os_global.c b/src/core/os_global.c
index b2a304f7f..7944280fe 100644
--- a/src/core/os_global.c
+++ b/src/core/os_global.c
@@ -32,7 +32,7 @@ class CommandOSGlobal : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_OperServ, u, OPER_HELP_GLOBAL, s_GlobalNoticer);
 		return true;
diff --git a/src/core/os_ignore.c b/src/core/os_ignore.c
index ca3cf5bb3..51985b76f 100644
--- a/src/core/os_ignore.c
+++ b/src/core/os_ignore.c
@@ -118,7 +118,7 @@ class CommandOSIgnore : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_OperServ, u, OPER_HELP_IGNORE);
 		return true;
diff --git a/src/core/os_jupe.c b/src/core/os_jupe.c
index ce4c1978f..5668c8d13 100644
--- a/src/core/os_jupe.c
+++ b/src/core/os_jupe.c
@@ -46,7 +46,7 @@ class CommandOSJupe : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_OperServ, u, OPER_HELP_JUPE);
 		return true;
diff --git a/src/core/os_kick.c b/src/core/os_kick.c
index a121fee4c..fb8374f98 100644
--- a/src/core/os_kick.c
+++ b/src/core/os_kick.c
@@ -51,7 +51,7 @@ class CommandOSKick : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_OperServ, u, OPER_HELP_KICK);
 		return true;
diff --git a/src/core/os_mode.c b/src/core/os_mode.c
index d880711d7..aac4e1518 100644
--- a/src/core/os_mode.c
+++ b/src/core/os_mode.c
@@ -47,7 +47,7 @@ class CommandOSMode : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_OperServ, u, OPER_HELP_MODE);
 		return true;
diff --git a/src/core/os_modinfo.c b/src/core/os_modinfo.c
index 28ee078de..870cebafb 100644
--- a/src/core/os_modinfo.c
+++ b/src/core/os_modinfo.c
@@ -53,7 +53,7 @@ class CommandOSModInfo : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_OperServ, u, OPER_HELP_MODINFO);
 		return true;
diff --git a/src/core/os_modlist.c b/src/core/os_modlist.c
index 05e2e4a0b..a8a7587c5 100644
--- a/src/core/os_modlist.c
+++ b/src/core/os_modlist.c
@@ -161,7 +161,7 @@ class CommandOSModList : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_OperServ, u, OPER_HELP_MODLIST);
 		return true;
diff --git a/src/core/os_modload.c b/src/core/os_modload.c
index 03b023304..5bef256f3 100644
--- a/src/core/os_modload.c
+++ b/src/core/os_modload.c
@@ -42,7 +42,7 @@ class CommandOSModLoad : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_OperServ, u, OPER_HELP_MODLOAD);
 		return true;
diff --git a/src/core/os_modunload.c b/src/core/os_modunload.c
index f83cfab29..b36251c87 100644
--- a/src/core/os_modunload.c
+++ b/src/core/os_modunload.c
@@ -44,7 +44,7 @@ class CommandOSModUnLoad : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_OperServ, u, OPER_HELP_MODUNLOAD);
 		return true;
diff --git a/src/core/os_news.c b/src/core/os_news.c
index f4375b328..3f1aeaad4 100644
--- a/src/core/os_news.c
+++ b/src/core/os_news.c
@@ -235,7 +235,7 @@ class NewsBase : public Command
 
 	virtual CommandReturn Execute(User *u, std::vector<std::string> &params) = 0;
 
-	virtual bool OnHelp(User *u, const std::string &subcommand) = 0;
+	virtual bool OnHelp(User *u, const ci::string &subcommand) = 0;
 
 	virtual void OnSyntaxError(User *u) = 0;
 };
@@ -260,7 +260,7 @@ class CommandOSLogonNews : public NewsBase
 		return this->DoNews(u, params, NEWS_LOGON);
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_OperServ, u, NEWS_HELP_LOGON, this->help_param1);
 		return true;
@@ -303,7 +303,7 @@ class CommandOSOperNews : public NewsBase
 		return this->DoNews(u, params, NEWS_OPER);
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_OperServ, u, NEWS_HELP_OPER, this->help_param1);
 		return true;
@@ -338,7 +338,7 @@ class CommandOSRandomNews : public NewsBase
 		return this->DoNews(u, params, NEWS_RANDOM);
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_OperServ, u, NEWS_HELP_RANDOM);
 		return true;
diff --git a/src/core/os_noop.c b/src/core/os_noop.c
index d0f83792a..e922065a2 100644
--- a/src/core/os_noop.c
+++ b/src/core/os_noop.c
@@ -59,7 +59,7 @@ class CommandOSNOOP : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_OperServ, u, OPER_HELP_NOOP);
 		return true;
diff --git a/src/core/os_oline.c b/src/core/os_oline.c
index f122a8c7c..ec6651f11 100644
--- a/src/core/os_oline.c
+++ b/src/core/os_oline.c
@@ -58,7 +58,7 @@ class CommandOSOLine : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_OperServ, u, OPER_HELP_OLINE);
 		return true;
diff --git a/src/core/os_quit.c b/src/core/os_quit.c
index 235611b22..727cc9fd5 100644
--- a/src/core/os_quit.c
+++ b/src/core/os_quit.c
@@ -37,7 +37,7 @@ class CommandOSQuit : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		if (!u->nc->HasCommand("operserv/quit"))
 			return false;
diff --git a/src/core/os_reload.c b/src/core/os_reload.c
index 527142d38..dad3185db 100644
--- a/src/core/os_reload.c
+++ b/src/core/os_reload.c
@@ -39,7 +39,7 @@ class CommandOSReload : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_OperServ, u, OPER_HELP_RELOAD);
 		return true;
diff --git a/src/core/os_restart.c b/src/core/os_restart.c
index c5a59ea73..3ec4ab62e 100644
--- a/src/core/os_restart.c
+++ b/src/core/os_restart.c
@@ -42,7 +42,7 @@ class CommandOSRestart : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_OperServ, u, OPER_HELP_RESTART);
 		return true;
diff --git a/src/core/os_session.c b/src/core/os_session.c
index d9cb15cb7..743aec79c 100644
--- a/src/core/os_session.c
+++ b/src/core/os_session.c
@@ -81,7 +81,7 @@ class CommandOSSession : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_OperServ, u, OPER_HELP_SESSION);
 		return true;
@@ -439,7 +439,7 @@ class CommandOSException : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_OperServ, u, OPER_HELP_EXCEPTION);
 		return true;
diff --git a/src/core/os_set.c b/src/core/os_set.c
index b532dca70..3eae0b164 100644
--- a/src/core/os_set.c
+++ b/src/core/os_set.c
@@ -260,7 +260,7 @@ class CommandOSSet : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		if (subcommand.empty())
 			notice_help(s_OperServ, u, OPER_HELP_SET);
diff --git a/src/core/os_sgline.c b/src/core/os_sgline.c
index 414d15fbd..8e7e175ec 100644
--- a/src/core/os_sgline.c
+++ b/src/core/os_sgline.c
@@ -306,7 +306,7 @@ class CommandOSSGLine : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_OperServ, u, OPER_HELP_SGLINE);
 		return true;
diff --git a/src/core/os_shutdown.c b/src/core/os_shutdown.c
index 321b418f4..60f87119d 100644
--- a/src/core/os_shutdown.c
+++ b/src/core/os_shutdown.c
@@ -38,7 +38,7 @@ class CommandOSShutdown : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		if (!u->nc->HasCommand("operserv/shutdown"))
 			return false;
diff --git a/src/core/os_sqline.c b/src/core/os_sqline.c
index e7438dcb2..22c3228c8 100644
--- a/src/core/os_sqline.c
+++ b/src/core/os_sqline.c
@@ -293,7 +293,7 @@ class CommandOSSQLine : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_OperServ, u, OPER_HELP_SQLINE);
 		return true;
diff --git a/src/core/os_staff.c b/src/core/os_staff.c
index 476b072c5..02c6048af 100644
--- a/src/core/os_staff.c
+++ b/src/core/os_staff.c
@@ -67,7 +67,7 @@ class CommandOSStaff : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_OperServ, u, OPER_HELP_STAFF);
 		return true;
diff --git a/src/core/os_stats.c b/src/core/os_stats.c
index a0f0e947b..c745a0592 100644
--- a/src/core/os_stats.c
+++ b/src/core/os_stats.c
@@ -305,7 +305,7 @@ class CommandOSStats : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_OperServ, u, OPER_HELP_STATS);
 		return true;
diff --git a/src/core/os_svsnick.c b/src/core/os_svsnick.c
index 168c8c0f6..e572330c0 100644
--- a/src/core/os_svsnick.c
+++ b/src/core/os_svsnick.c
@@ -76,7 +76,7 @@ class CommandOSSVSNick : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_OperServ, u, OPER_HELP_SVSNICK);
 		return true;
diff --git a/src/core/os_szline.c b/src/core/os_szline.c
index 264f85818..e23d36d3b 100644
--- a/src/core/os_szline.c
+++ b/src/core/os_szline.c
@@ -292,7 +292,7 @@ class CommandOSSZLine : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_OperServ, u, OPER_HELP_SZLINE);
 		return true;
diff --git a/src/core/os_umode.c b/src/core/os_umode.c
index 34d7062ea..2fd2547ef 100644
--- a/src/core/os_umode.c
+++ b/src/core/os_umode.c
@@ -62,7 +62,7 @@ class CommandOSUMode : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_OperServ, u, OPER_HELP_UMODE);
 		return true;
diff --git a/src/core/os_update.c b/src/core/os_update.c
index bba4df06a..ac76ee981 100644
--- a/src/core/os_update.c
+++ b/src/core/os_update.c
@@ -29,7 +29,7 @@ class CommandOSUpdate : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_OperServ, u, OPER_HELP_UPDATE);
 		return true;
diff --git a/src/core/os_userlist.c b/src/core/os_userlist.c
index 38325484f..38119688c 100644
--- a/src/core/os_userlist.c
+++ b/src/core/os_userlist.c
@@ -75,7 +75,7 @@ class CommandOSUserList : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		notice_help(s_OperServ, u, OPER_HELP_USERLIST);
 		return true;
diff --git a/src/modules/cs_appendtopic.c b/src/modules/cs_appendtopic.c
index c102e35b1..d2c53e271 100644
--- a/src/modules/cs_appendtopic.c
+++ b/src/modules/cs_appendtopic.c
@@ -117,7 +117,7 @@ class CommandCSAppendTopic : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		me->NoticeLang(s_ChanServ, u, LNG_APPENDTOPIC_SYNTAX);
 		ircdproto->SendMessage(findbot(s_ChanServ), u->nick, " ");
diff --git a/src/modules/cs_enforce.c b/src/modules/cs_enforce.c
index 22987965e..b61295966 100644
--- a/src/modules/cs_enforce.c
+++ b/src/modules/cs_enforce.c
@@ -228,7 +228,7 @@ class CommandCSEnforce : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		me->NoticeLang(s_ChanServ, u, LNG_ENFORCE_SYNTAX);
 		ircdproto->SendMessage(findbot(s_ChanServ), u->nick, " ");
diff --git a/src/modules/cs_tban.c b/src/modules/cs_tban.c
index 160fd19ee..ffcc3bad2 100644
--- a/src/modules/cs_tban.c
+++ b/src/modules/cs_tban.c
@@ -70,7 +70,7 @@ class CommandCSTBan : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		this->OnSyntaxError(u);
 		ircdproto->SendMessage(findbot(s_ChanServ), u->nick, " ");
diff --git a/src/modules/hs_request.c b/src/modules/hs_request.c
index 2a047d9b9..dbd6b67eb 100644
--- a/src/modules/hs_request.c
+++ b/src/modules/hs_request.c
@@ -184,7 +184,7 @@ class CommandHSRequest : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		me->NoticeLang(s_HostServ, u, LNG_REQUEST_SYNTAX);
 		ircdproto->SendMessage(findbot(s_HostServ), u->nick, " ");
@@ -247,7 +247,7 @@ class CommandHSActivate : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		me->NoticeLang(s_HostServ, u, LNG_ACTIVATE_SYNTAX);
 		ircdproto->SendMessage(findbot(s_HostServ), u->nick, " ");
@@ -310,7 +310,7 @@ class CommandHSReject : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		me->NoticeLang(s_HostServ, u, LNG_REJECT_SYNTAX);
 		ircdproto->SendMessage(findbot(s_HostServ), u->nick, " ");
@@ -388,7 +388,7 @@ class CommandHSWaiting : public HSListBase
 		return this->DoList(u, params);
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		me->NoticeLang(s_HostServ, u, LNG_WAITING_SYNTAX);
 		ircdproto->SendMessage(findbot(s_HostServ), u->nick, " ");
diff --git a/src/modules/os_info.c b/src/modules/os_info.c
index 93eddb88c..fcd20d9bb 100644
--- a/src/modules/os_info.c
+++ b/src/modules/os_info.c
@@ -123,7 +123,7 @@ class CommandNSOInfo : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		if (!is_oper(u))
 			return false;
@@ -200,7 +200,7 @@ class CommandCSOInfo : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const std::string &subcommand)
+	bool OnHelp(User *u, const ci::string &subcommand)
 	{
 		if (!is_oper(u))
 			return false;