diff --git a/lib/list.c b/lib/list.c
index 8fa0e085ac..190c211d9d 100644
--- a/lib/list.c
+++ b/lib/list.c
@@ -8,6 +8,8 @@
 
 #include "config.h"
 
+#include <stddef.h>
+
 #include "alloc/malloc.h"
 #include "prototypes.h"
 #include "defines.h"
@@ -30,8 +32,8 @@
 /*@only@*/char **
 add_list(/*@returned@*/ /*@only@*/char **list, const char *member)
 {
-	int i;
-	char **tmp;
+	size_t  i;
+	char    **tmp;
 
 	assert (NULL != member);
 	assert (NULL != list);
@@ -81,8 +83,8 @@ add_list(/*@returned@*/ /*@only@*/char **list, const char *member)
 /*@only@*/char **
 del_list(/*@returned@*/ /*@only@*/char **list, const char *member)
 {
-	int i, j;
-	char **tmp;
+	size_t  i, j;
+	char    **tmp;
 
 	assert (NULL != member);
 	assert (NULL != list);
@@ -136,8 +138,8 @@ del_list(/*@returned@*/ /*@only@*/char **list, const char *member)
 /*@only@*/char **
 dup_list(char *const *list)
 {
-	int i;
-	char **tmp;
+	size_t  i;
+	char    **tmp;
 
 	assert (NULL != list);
 
@@ -145,12 +147,8 @@ dup_list(char *const *list)
 
 	tmp = xmalloc_T(i + 1, char *);
 
-	i = 0;
-	while (NULL != *list) {
-		tmp[i] = xstrdup (*list);
-		i++;
-		list++;
-	}
+	for (i = 0; NULL != list[i]; i++)
+		tmp[i] = xstrdup(list[i]);
 
 	tmp[i] = NULL;
 	return tmp;
@@ -178,11 +176,9 @@ bool is_on_list (char *const *list, const char *member)
 	assert (NULL != member);
 	assert (NULL != list);
 
-	while (NULL != *list) {
-		if (streq(*list, member)) {
+	for (size_t i = 0; list[i] != NULL; i++) {
+		if (streq(list[i], member))
 			return true;
-		}
-		list++;
 	}
 
 	return false;