diff --git a/cmd-queue.c b/cmd-queue.c
index 56745c38..804216fa 100644
--- a/cmd-queue.c
+++ b/cmd-queue.c
@@ -206,7 +206,7 @@ cmdq_fire_command(struct cmdq_item *item)
 		goto out;
 	}
 	if (item->client == NULL)
-		item->client = cmd_find_client(item, NULL, CMD_FIND_QUIET);
+		item->client = cmd_find_client(item, NULL, 1);
 
 	retval = cmd->entry->exec(cmd, item);
 	if (retval == CMD_RETURN_ERROR)
@@ -325,8 +325,7 @@ cmdq_next(struct client *c)
 			item->time = time(NULL);
 			item->number = ++number;
 
-			switch (item->type)
-			{
+			switch (item->type) {
 			case CMDQ_COMMAND:
 				retval = cmdq_fire_command(item);
 
diff --git a/tmux.h b/tmux.h
index f0453b99..e2d46595 100644
--- a/tmux.h
+++ b/tmux.h
@@ -41,7 +41,6 @@ extern char   **environ;
 struct args;
 struct client;
 struct cmdq_item;
-struct cmdq_subitem;
 struct cmdq_list;
 struct environ;
 struct input_ctx;