diff --git a/arguments.c b/arguments.c
index d3a214cf..f7f8f737 100644
--- a/arguments.c
+++ b/arguments.c
@@ -177,34 +177,20 @@ args_print(struct args *args)
 			args_print_add(&buf, &len, " -%c ", entry->flag);
 		else
 			args_print_add(&buf, &len, "-%c ", entry->flag);
-#ifdef TMATE_SLAVE
-		if (strchr(entry->value, '\'') != NULL)
+		if (strchr(entry->value, ' ') != NULL)
 			args_print_add(&buf, &len, "\"%s\"", entry->value);
 		else
-			args_print_add(&buf, &len, "'%s'", entry->value);
-#else
-		if (strchr(entry->value, '\'') != NULL)
-			args_print_add(&buf, &len, "\"%s\"", entry->value);
-		else
-			args_print_add(&buf, &len, "'%s'", entry->value);
-#endif
+			args_print_add(&buf, &len, "%s", entry->value);
 	}
 
 	/* And finally the argument vector. */
 	for (i = 0; i < args->argc; i++) {
 		if (*buf != '\0')
 			args_print_add(&buf, &len, " ");
-#ifdef TMATE_SLAVE
-		if (strchr(args->argv[i], '\'') != NULL)
-			args_print_add(&buf, &len, "\"%s\"", args->argv[i]);
-		else
-			args_print_add(&buf, &len, "'%s'", args->argv[i]);
-#else
 		if (strchr(args->argv[i], ' ') != NULL)
 			args_print_add(&buf, &len, "\"%s\"", args->argv[i]);
 		else
 			args_print_add(&buf, &len, "%s", args->argv[i]);
-#endif
 	}
 
 	return (buf);
diff --git a/tmate-daemon-decoder.c b/tmate-daemon-decoder.c
index ac48e3e2..0fcb6f0b 100644
--- a/tmate-daemon-decoder.c
+++ b/tmate-daemon-decoder.c
@@ -213,7 +213,6 @@ static void tmate_exec_cmd(__unused struct tmate_session *session,
 	tmate_info("Local cmd: %s", cmd_str);
 
 	if (cmd_string_parse(cmd_str, &cmdlist, NULL, 0, &cause) != 0) {
-		tmate_info("parse error: %s", cause);
 		free(cause);
 		goto out;
 	}