diff --git a/format.c b/format.c
index 57e9e6a4..6036dac3 100644
--- a/format.c
+++ b/format.c
@@ -879,9 +879,8 @@ format_replace(struct format_tree *ft, const char *key, size_t keylen,
 		*ptr = '\0';
 
 		found = format_find(ft, copy + 1, modifiers);
-		if (found == NULL) {
-			log_debug("XXX %s", copy + 1);
-			found = format_expand(ft, copy + 1);}
+		if (found == NULL)
+			found = format_expand(ft, copy + 1);
 		if (format_choose(ptr + 1, &left, &right) != 0)
 			goto fail;
 
diff --git a/tty.c b/tty.c
index 01e5fde2..e40e1081 100644
--- a/tty.c
+++ b/tty.c
@@ -1356,13 +1356,15 @@ tty_margin(struct tty *tty, u_int rleft, u_int rright)
 	if (tty->rleft == rleft && tty->rright == rright)
 		return;
 
-	tty->rupper = 0;
-	tty->rlower = tty->sy - 1;
+	tty_putcode2(tty, TTYC_CSR, tty->rupper, tty->rlower);
 
 	tty->rleft = rleft;
 	tty->rright = rright;
 
-	snprintf(s, sizeof s, "\033[r\033[%u;%us", rleft + 1, rright + 1);
+	if (rleft == 0 && rright == tty->sx - 1)
+		snprintf(s, sizeof s, "\033[s");
+	else
+		snprintf(s, sizeof s, "\033[%u;%us", rleft + 1, rright + 1);
 	tty_puts(tty, s);
 	tty->cx = tty->cy = 0;
 }