5 files changed, 3 insertions, 18 deletions
diff --git a/cmd.c b/cmd.c
index cf1f7496..8ed6596c 100644
--- a/cmd.c
+++ b/cmd.c
@@ -335,10 +335,6 @@ cmd_try_alias(int *argc, char ***argv)
 	a = options_array_first(o);
 	while (a != NULL) {
 		ov = options_array_item_value(a);
-		if (ov == NULL) {
-			a = options_array_next(a);
-			continue;
-		}
 		cp = strchr(ov->string, '=');
 		if (cp != NULL &&
 		    (size_t)(cp - ov->string) == wanted &&
diff --git a/environ.c b/environ.c
index 301c4f29..25968f7b 100644
--- a/environ.c
+++ b/environ.c
@@ -185,10 +185,6 @@ environ_update(struct options *oo, struct environ *src, struct environ *dst)
 	a = options_array_first(o);
 	while (a != NULL) {
 		ov = options_array_item_value(a);
-		if (ov == NULL) {
-			a = options_array_next(a);
-			continue;
-		}
 		if ((envent = environ_find(src, ov->string)) == NULL)
 			environ_clear(dst, ov->string);
 		else
diff --git a/status.c b/status.c
index 1a11a564..34ed3778 100644
--- a/status.c
+++ b/status.c
@@ -1293,7 +1293,6 @@ status_prompt_complete_list(u_int *size, const char *s)
 	size_t					  slen = strlen(s), valuelen;
 	struct options_entry			 *o;
 	struct options_array_item		 *a;
-	union options_value			 *ov;
 	const char				 *layouts[] = {
 		"even-horizontal", "even-vertical", "main-horizontal",
 		"main-vertical", "tiled", NULL
@@ -1322,11 +1321,7 @@ status_prompt_complete_list(u_int *size, const char *s)
 	if (o != NULL) {
 		a = options_array_first(o);
 		while (a != NULL) {
-			ov = options_array_item_value(a);
-			if (ov == NULL)
-				goto next;
-
-			value = ov->string;
+			value = options_array_item_value(a)->string;
 			if ((cp = strchr(value, '=')) == NULL)
 			    goto next;
 			valuelen = cp - value;
diff --git a/tty-keys.c b/tty-keys.c
index c6dcbb56..850c9119 100644
--- a/tty-keys.c
+++ b/tty-keys.c
@@ -429,8 +429,7 @@ tty_keys_build(struct tty *tty)
 		a = options_array_first(o);
 		while (a != NULL) {
 			ov = options_array_item_value(a);
-			if (ov != NULL)
-				tty_keys_add(tty, ov->string, KEYC_USER + i);
+			tty_keys_add(tty, ov->string, KEYC_USER + i);
 			a = options_array_next(a);
 		}
 	}
diff --git a/tty-term.c b/tty-term.c
index 47da3905..b692a6cc 100644
--- a/tty-term.c
+++ b/tty-term.c
@@ -496,8 +496,7 @@ tty_term_find(char *name, int fd, char **cause)
 	a = options_array_first(o);
 	while (a != NULL) {
 		ov = options_array_item_value(a);
-		if (ov != NULL)
-			tty_term_override(term, ov->string);
+		tty_term_override(term, ov->string);
 		a = options_array_next(a);
 	}