4 files changed, 10 insertions, 27 deletions
diff --git a/modules/commands/cs_info.cpp b/modules/commands/cs_info.cpp
index 3c113269e..591a0f673 100644
--- a/modules/commands/cs_info.cpp
+++ b/modules/commands/cs_info.cpp
@@ -13,8 +13,6 @@
 
 #include "module.h"
 
-struct ExtensibleString : Anope::string, ExtensibleItem { };
-
 class CommandCSInfo : public Command
 {
 	void CheckOptStr(Anope::string &buf, ChannelInfoFlag opt, const char *str, const ChannelInfo *ci, const NickCore *nc)
@@ -106,7 +104,7 @@ class CommandCSInfo : public Command
 		}
 		if (ci->HasFlag(CI_SUSPENDED))
 		{
-			Anope::string *by = ci->GetExt<ExtensibleString *>("suspend_by"), *reason = ci->GetExt<ExtensibleString *>("suspend_reason");
+			Anope::string *by = ci->GetExt<ExtensibleItemClass<Anope::string> *>("suspend_by"), *reason = ci->GetExt<ExtensibleItemClass<Anope::string> *>("suspend_reason");
 			if (by != NULL)
 				info["Suspended"] = Anope::printf("[%s] %s", by->c_str(), (reason && !reason->empty() ? reason->c_str() : NO_REASON));
 		}
diff --git a/modules/commands/cs_suspend.cpp b/modules/commands/cs_suspend.cpp
index b0ffa3e4c..e7969c926 100644
--- a/modules/commands/cs_suspend.cpp
+++ b/modules/commands/cs_suspend.cpp
@@ -13,11 +13,6 @@
 
 #include "module.h"
 
-struct ExtensibleString : Anope::string, ExtensibleItem
-{
-	ExtensibleString(const Anope::string &s) : Anope::string(s) { }
-};
-
 struct ChanSuspend : ExtensibleItem, Serializable
 {
 	Anope::string chan;
@@ -106,9 +101,9 @@ class CommandCSSuspend : public Command
 		}
 
 		ci->SetFlag(CI_SUSPENDED);
-		ci->Extend("suspend_by", new ExtensibleString(source.GetNick()));
+		ci->Extend("suspend_by", new ExtensibleItemClass<Anope::string>(source.GetNick()));
 		if (!reason.empty())
-			ci->Extend("suspend_reason", new ExtensibleString(reason));
+			ci->Extend("suspend_reason", new ExtensibleItemClass<Anope::string>(reason));
 
 		if (ci->c)
 		{
@@ -185,7 +180,7 @@ class CommandCSUnSuspend : public Command
 			return;
 		}
 
-		Anope::string *by = ci->GetExt<ExtensibleString *>("suspend_by"), *reason = ci->GetExt<ExtensibleString *>("suspend_reason");
+		Anope::string *by = ci->GetExt<ExtensibleItemClass<Anope::string> *>("suspend_by"), *reason = ci->GetExt<ExtensibleItemClass<Anope::string> *>("suspend_reason");
 		if (by != NULL)
 			Log(LOG_ADMIN, source, this, ci) << " which was suspended by " << *by << " for: " << (reason && !reason->empty() ? *reason : "No reason");
 
diff --git a/modules/commands/ns_register.cpp b/modules/commands/ns_register.cpp
index 05a87c4cf..0d51ef20c 100644
--- a/modules/commands/ns_register.cpp
+++ b/modules/commands/ns_register.cpp
@@ -15,11 +15,6 @@
 
 static bool SendRegmail(User *u, const NickAlias *na, const BotInfo *bi);
 
-struct ExtensibleString : Anope::string, ExtensibleItem
-{
-	ExtensibleString(const Anope::string &s) : Anope::string(s) { }
-};
-
 class CommandNSConfirm : public Command
 {
  public:
@@ -50,7 +45,7 @@ class CommandNSConfirm : public Command
 		}
 		else if (source.nc)
 		{
-			Anope::string *code = source.nc->GetExt<ExtensibleString *>("ns_register_passcode");
+			Anope::string *code = source.nc->GetExt<ExtensibleItemClass<Anope::string> *>("ns_register_passcode");
 			if (code != NULL && *code == passcode)
 			{
 				NickCore *nc = source.nc;
@@ -354,7 +349,7 @@ static bool SendRegmail(User *u, const NickAlias *na, const BotInfo *bi)
 {
 	NickCore *nc = na->nc;
 
-	Anope::string *code = na->nc->GetExt<ExtensibleString *>("ns_register_passcode");
+	Anope::string *code = na->nc->GetExt<ExtensibleItemClass<Anope::string> *>("ns_register_passcode");
 	Anope::string codebuf;
 	if (code == NULL)
 	{
@@ -368,7 +363,7 @@ static bool SendRegmail(User *u, const NickAlias *na, const BotInfo *bi)
 		int idx, min = 1, max = 62;
 		for (idx = 0; idx < 9; ++idx)
 			codebuf += chars[1 + static_cast<int>((static_cast<float>(max - min)) * static_cast<uint16_t>(rand()) / 65536.0) + min];
-		nc->Extend("ns_register_passcode", new ExtensibleString(codebuf));
+		nc->Extend("ns_register_passcode", new ExtensibleItemClass<Anope::string>(codebuf));
 	}
 	else
 		codebuf = *code;
diff --git a/modules/commands/ns_set_email.cpp b/modules/commands/ns_set_email.cpp
index 0d5b5d27c..46aec504c 100644
--- a/modules/commands/ns_set_email.cpp
+++ b/modules/commands/ns_set_email.cpp
@@ -13,11 +13,6 @@
 
 #include "module.h"
 
-struct ExtensibleString : Anope::string, ExtensibleItem
-{
-	ExtensibleString(const Anope::string &s) : Anope::string(s) { }
-};
-
 static bool SendConfirmMail(User *u, const BotInfo *bi)
 {
 	int chars[] = {
@@ -32,7 +27,7 @@ static bool SendConfirmMail(User *u, const BotInfo *bi)
 	for (idx = 0; idx < 9; ++idx)
 		code += chars[1 + static_cast<int>((static_cast<float>(max - min)) * static_cast<uint16_t>(rand()) / 65536.0) + min];
 	
-	u->Account()->Extend("ns_set_email_passcode", new ExtensibleString(code));
+	u->Account()->Extend("ns_set_email_passcode", new ExtensibleItemClass<Anope::string>(code));
 
 	Anope::string subject = Config->MailEmailchangeSubject;
 	Anope::string message = Config->MailEmailchangeMessage;
@@ -85,7 +80,7 @@ class CommandNSSetEmail : public Command
 
 		if (!param.empty() && Config->NSConfirmEmailChanges && !source.IsServicesOper())
 		{
-			source.nc->Extend("ns_set_email", new ExtensibleString(param));
+			source.nc->Extend("ns_set_email", new ExtensibleItemClass<Anope::string>(param));
 			Anope::string old = source.nc->email;
 			source.nc->email = param;
 			if (SendConfirmMail(source.GetUser(), source.owner))
@@ -168,7 +163,7 @@ class NSSetEmail : public Module
 		NickCore *uac = source.nc;
 		if (command->name == "nickserv/confirm" && !params.empty() && uac)
 		{
-			Anope::string *new_email = uac->GetExt<ExtensibleString *>("ns_set_email"), *passcode = uac->GetExt<ExtensibleString *>("ns_set_email_passcode");
+			Anope::string *new_email = uac->GetExt<ExtensibleItemClass<Anope::string> *>("ns_set_email"), *passcode = uac->GetExt<ExtensibleItemClass<Anope::string> *>("ns_set_email_passcode");
 			if (new_email && passcode)
 			{
 				if (params[0] == *passcode)