diff --git a/cmd-clear-history.c b/cmd-clear-history.c
index 1afd9053..b5e0f84f 100644
--- a/cmd-clear-history.c
+++ b/cmd-clear-history.c
@@ -44,13 +44,10 @@ static enum cmd_retval
 cmd_clear_history_exec(__unused struct cmd *self, struct cmdq_item *item)
 {
 	struct window_pane	*wp = item->state.tflag.wp;
-	struct grid		*gd;
-
-	gd = item->state.tflag.wp->base.grid;
 
 	if (wp->mode == &window_copy_mode)
 		window_pane_reset_mode(wp);
-	grid_clear_history(gd);
+	grid_clear_history(wp->base.grid);
 
 	return (CMD_RETURN_NORMAL);
 }
diff --git a/cmd-refresh-client.c b/cmd-refresh-client.c
index b1234f36..289563c6 100644
--- a/cmd-refresh-client.c
+++ b/cmd-refresh-client.c
@@ -24,7 +24,8 @@
  * Refresh client.
  */
 
-static enum cmd_retval	cmd_refresh_client_exec(struct cmd *, struct cmdq_item *);
+static enum cmd_retval	cmd_refresh_client_exec(struct cmd *,
+			    struct cmdq_item *);
 
 const struct cmd_entry cmd_refresh_client_entry = {
 	.name = "refresh-client",