diff --git a/input.c b/input.c
index 4a964550..cbcdd83c 100644
--- a/input.c
+++ b/input.c
@@ -720,11 +720,11 @@ input_parse(struct window_pane *wp)
 		 * Execute the handler, if any. Don't switch state if it
 		 * returns non-zero.
 		 */
-		if (itr->handler && itr->handler(ictx) != 0)
+		if (itr->handler != NULL && itr->handler(ictx) != 0)
 			continue;
 
 		/* And switch state, if necessary. */
-		if (itr->state) {
+		if (itr->state != NULL) {
 			if (ictx->state->exit != NULL)
 				ictx->state->exit(ictx);
 			ictx->state = itr->state;
@@ -924,9 +924,9 @@ input_c0_dispatch(struct input_ctx *ictx)
 int
 input_esc_dispatch(struct input_ctx *ictx)
 {
-	struct screen_write_ctx	*sctx = &ictx->ctx;
-	struct screen		*s = sctx->s;
-	struct input_table_entry       *entry;
+	struct screen_write_ctx		*sctx = &ictx->ctx;
+	struct screen			*s = sctx->s;
+	struct input_table_entry	*entry;
 
 	if (ictx->flags & INPUT_DISCARD)
 		return (0);