diff --git a/utf8-combined.c b/utf8-combined.c
index 1eee3b82..65ecf9cd 100644
--- a/utf8-combined.c
+++ b/utf8-combined.c
@@ -175,7 +175,7 @@ utf8_should_combine(const struct utf8_data *with, const struct utf8_data *add)
 			return (1);
 		break;
 	}
-	return 0;
+	return (0);
 }
 
 static enum hanguljamo_subclass
diff --git a/utf8.c b/utf8.c
index 4df8ccd5..4d6ebcbd 100644
--- a/utf8.c
+++ b/utf8.c
@@ -590,7 +590,7 @@ utf8_towc(const struct utf8_data *ud, wchar_t *wc)
 	case 0:
 		return (UTF8_ERROR);
 	}
-	log_debug("UTF-8 %.*s is %05X", (int)ud->size, ud->data, (u_int)*wc);
+	log_debug("UTF-8 %.*s is U+%06X", (int)ud->size, ud->data, (u_int)*wc);
 	return (UTF8_DONE);
 }
 
diff --git a/window.c b/window.c
index a3b602fd..57f3c972 100644
--- a/window.c
+++ b/window.c
@@ -376,12 +376,10 @@ window_pane_destroy_ready(struct window_pane *wp)
 {
 	int	n;
 
-	if (wp->pipe_fd != -1) {
-		if (EVBUFFER_LENGTH(wp->pipe_event->output) != 0)
-			return (0);
-		if (ioctl(wp->fd, FIONREAD, &n) != -1 && n > 0)
-			return (0);
-	}
+	if (wp->pipe_fd != -1 && EVBUFFER_LENGTH(wp->pipe_event->output) != 0)
+		return (0);
+	if (ioctl(wp->fd, FIONREAD, &n) != -1 && n > 0)
+		return (0);
 
 	if (~wp->flags & PANE_EXITED)
 		return (0);