diff --git a/src/channel.c b/src/channel.c
index 78055c5d0..8ccd71fad 100644
--- a/src/channel.c
+++ b/src/channel.c
@@ -1438,10 +1438,8 @@ int  check_for_chan_flood(aClient *cptr, aClient *sptr, aChannel *chptr)
 		sendto_channel_butserv(chptr, &me,
 		    ":%s KICK %s %s :%s", me.name,
 		    chptr->chname, sptr->name, comment);
-		sendto_serv_butone_token(cptr, me.name,
-			MSG_KICK, TOK_KICK, 
-			"%s %s :%s",
-		   chptr->chname, sptr->name, comment);
+		sendto_serv_butone(cptr, ":%s KICK %s %s :%s",
+		   me.name, chptr->chname, sptr->name, comment);
 		remove_user_from_channel(sptr, chptr);
 		return 1;
 	}
@@ -1788,8 +1786,8 @@ void set_channel_mlock(aClient *cptr, aClient *sptr, aChannel *chptr, const char
 
 	if (propagate)
 	{
-		sendto_serv_butone_token(cptr, cptr->name, MSG_MLOCK, TOK_MLOCK, "%B %s :%s",
-					 chptr->creationtime, chptr->chname,
+		sendto_serv_butone(cptr, ":%s MLOCK %B %s :%s",
+					 cptr->name, chptr->creationtime, chptr->chname,
 					 BadPtr(chptr->mode_lock) ? "" : chptr->mode_lock);
 	}
 }
diff --git a/src/s_misc.c b/src/s_misc.c
index 8b37208ed..53535f0fe 100644
--- a/src/s_misc.c
+++ b/src/s_misc.c
@@ -716,9 +716,7 @@ static void exit_one_client(aClient *cptr, aClient *sptr, aClient *from, char *c
 		if ((sptr->flags & FLAGS_KILLED) == 0)
 		{
 			if (split == 0)
-				sendto_serv_butone_token
-				    (cptr, sptr->name, MSG_QUIT, TOK_QUIT,
-				    ":%s", comment);
+				sendto_serv_butone(cptr, ":%s QUIT :%s", sptr->name, comment);
 			else
 				/*
 				 * Then this is a split, only old (stupid)
@@ -1121,7 +1119,7 @@ void kick_insecure_users(aChannel *chptr)
 				sendto_channel_butserv(chptr, &me, ":%s KICK %s %s :%s", me.name, chptr->chname, cptr->name, comment);
 			}
 
-			sendto_serv_butone_token(&me, me.name, MSG_KICK, TOK_KICK, "%s %s :%s", chptr->chname, cptr->name, comment);
+			sendto_serv_butone(&me, ":%s KICK %s %s :%s", me.name, chptr->chname, cptr->name, comment);
 
 			remove_user_from_channel(cptr, chptr);
 		}
diff --git a/src/s_user.c b/src/s_user.c
index 8a0369089..05e3fd55b 100644
--- a/src/s_user.c
+++ b/src/s_user.c
@@ -80,8 +80,7 @@ void iNAH_host(aClient *sptr, char *host)
 	}
 	sptr->user->virthost = strdup(host);
 	if (MyConnect(sptr))
-		sendto_serv_butone_token(&me, sptr->name, MSG_SETHOST,
-		    TOK_SETHOST, "%s", sptr->user->virthost);
+		sendto_serv_butone(&me, ":%s SETHOST :%s", sptr->name, sptr->user->virthost);
 	sptr->umodes |= UMODE_SETHOST;
 
 	if (UHOST_ALLOWED == UHALLOW_REJOIN)
diff --git a/src/send.c b/src/send.c
index 39b5f5f10..76af75d43 100644
--- a/src/send.c
+++ b/src/send.c
@@ -1314,8 +1314,7 @@ void sendto_snomask_global(int snomask, char *pattern, ...)
 			*p++ = Snomask_Table[i].flag;
 	*p = '\0';
 
-	sendto_serv_butone_token(NULL, me.name, MSG_SENDSNO, TOK_SENDSNO,
-		"%s :%s", snobuf, nbuf);
+	sendto_serv_butone(&me, ":%s SENDSNO %s :%s", me.name, "%s :%s", snobuf, nbuf);
 }
 
 /** Send to specified snomask - local.
@@ -1366,8 +1365,7 @@ void sendto_snomask_normal_global(int snomask, char *pattern, ...)
 			*p++ = Snomask_Table[i].flag;
 	*p = '\0';
 
-	sendto_serv_butone_token(NULL, me.name, MSG_SENDSNO, TOK_SENDSNO,
-		"%s :%s", snobuf, nbuf);
+	sendto_serv_butone(&me, ":%s SENDSNO %s :%s", me.name, "%s :%s", snobuf, nbuf);
 }