Index: src/commands.mm
==================================================================
--- src/commands.mm
+++ src/commands.mm
@@ -220,12 +220,14 @@
 			p += strcspn(p, ";\n\0");
 			// more statements if this isn't the end of the string
 			cont = *p++ != 0;
 			OFString *c = w[0];
 			// strip irc-style command prefix
-			if ([c hasPrefix:@"/"])
+			if ([c hasPrefix:@"/"]) {
 				c = [c substringFromIndex:1];
+				w[0] = c;
+			}
 			// empty statement
 			if (c.length == 0)
 				continue;
 
 			__kindof Identifier *identifier = identifiers[c];
@@ -467,15 +469,11 @@
 }
 
 void
 concatword(OFString *s)
 {
-	// The original used this code which does nothing:
-	// for (char *a = s, *b = s; *a = *b; b++)
-	//	if (*a != ' ')
-	//		a++;
-	concat(s);
+	concat([s stringByReplacingOccurrencesOfString:@" " withString:@""]);
 }
 
 int
 listlen(OFString *a_)
 {