diff --git a/cmd-attach-session.c b/cmd-attach-session.c
index a67ec82c..79e14616 100644
--- a/cmd-attach-session.c
+++ b/cmd-attach-session.c
@@ -51,7 +51,6 @@ cmd_attach_session(struct cmd_q *cmdq, const char *tflag, int dflag, int rflag,
 	struct window_pane	*wp = NULL;
 	const char		*update;
 	char			*cause;
-	u_int			 i;
 	int			 fd;
 	struct format_tree	*ft;
 	char			*cp;
@@ -92,11 +91,8 @@ cmd_attach_session(struct cmd_q *cmdq, const char *tflag, int dflag, int rflag,
 			 * Can't use server_write_session in case attaching to
 			 * the same session as currently attached to.
 			 */
-			for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
-				c = ARRAY_ITEM(&clients, i);
-				if (c == NULL || c->session != s)
-					continue;
-				if (c == cmdq->client)
+			TAILQ_FOREACH(c, &clients, entry) {
+				if (c->session != s || c == cmdq->client)
 					continue;
 				server_write_client(c, MSG_DETACH,
 				    c->session->name,
diff --git a/cmd-choose-client.c b/cmd-choose-client.c
index 3002f7ba..49fe2a34 100644
--- a/cmd-choose-client.c
+++ b/cmd-choose-client.c
@@ -59,7 +59,7 @@ cmd_choose_client_exec(struct cmd *self, struct cmd_q *cmdq)
 	struct winlink			*wl;
 	const char			*template;
 	char				*action;
-	u_int			 	 i, idx, cur;
+	u_int			 	 idx, cur;
 
 	if ((c = cmd_current_client(cmdq)) == NULL) {
 		cmdq_error(cmdq, "no client available");
@@ -81,24 +81,24 @@ cmd_choose_client_exec(struct cmd *self, struct cmd_q *cmdq)
 		action = xstrdup("detach-client -t '%%'");
 
 	cur = idx = 0;
-	for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
-		c1 = ARRAY_ITEM(&clients, i);
-		if (c1 == NULL || c1->session == NULL || c1->tty.path == NULL)
+	TAILQ_FOREACH(c1, &clients, entry) {
+		if (c1->session == NULL || c1->tty.path == NULL)
 			continue;
 		if (c1 == cmdq->client)
 			cur = idx;
-		idx++;
 
 		cdata = window_choose_data_create(TREE_OTHER, c, c->session);
-		cdata->idx = i;
+		cdata->idx = idx;
 
 		cdata->ft_template = xstrdup(template);
-		format_add(cdata->ft, "line", "%u", i);
+		format_add(cdata->ft, "line", "%u", idx);
 		format_defaults(cdata->ft, c1, NULL, NULL, NULL);
 
 		cdata->command = cmd_template_replace(action, c1->tty.path, 1);
 
 		window_choose_add(wl->window->active, cdata);
+
+		idx++;
 	}
 	free(action);
 
@@ -112,15 +112,19 @@ void
 cmd_choose_client_callback(struct window_choose_data *cdata)
 {
 	struct client  	*c;
+	u_int		 idx;
 
 	if (cdata == NULL)
 		return;
 	if (cdata->start_client->flags & CLIENT_DEAD)
 		return;
 
-	if (cdata->idx > ARRAY_LENGTH(&clients) - 1)
-		return;
-	c = ARRAY_ITEM(&clients, cdata->idx);
+	idx = 0;
+	TAILQ_FOREACH(c, &clients, entry) {
+		if (idx == cdata->idx)
+			break;
+		idx++;
+	}
 	if (c == NULL || c->session == NULL)
 		return;
 
diff --git a/cmd-detach-client.c b/cmd-detach-client.c
index 7f87d2c6..4bae9997 100644
--- a/cmd-detach-client.c
+++ b/cmd-detach-client.c
@@ -51,7 +51,6 @@ cmd_detach_client_exec(struct cmd *self, struct cmd_q *cmdq)
 	struct client	*c, *cloop;
 	struct session	*s;
 	enum msgtype	 msgtype;
-	u_int 		 i;
 
 	if (self->entry == &cmd_suspend_client_entry) {
 		if ((c = cmd_find_client(cmdq, args_get(args, 't'), 0)) == NULL)
@@ -72,9 +71,8 @@ cmd_detach_client_exec(struct cmd *self, struct cmd_q *cmdq)
 		if (s == NULL)
 			return (CMD_RETURN_ERROR);
 
-		for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
-			cloop = ARRAY_ITEM(&clients, i);
-			if (cloop == NULL || cloop->session != s)
+		TAILQ_FOREACH(cloop, &clients, entry) {
+			if (cloop->session != s)
 				continue;
 			server_write_client(cloop, msgtype,
 			    cloop->session->name,
@@ -88,11 +86,8 @@ cmd_detach_client_exec(struct cmd *self, struct cmd_q *cmdq)
 		return (CMD_RETURN_ERROR);
 
 	if (args_has(args, 'a')) {
-		for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
-			cloop = ARRAY_ITEM(&clients, i);
-			if (cloop == NULL || cloop->session == NULL)
-				continue;
-			if (cloop == c)
+		TAILQ_FOREACH(cloop, &clients, entry) {
+			if (cloop->session == NULL || cloop == c)
 				continue;
 			server_write_client(cloop, msgtype,
 			    cloop->session->name,
diff --git a/cmd-list-clients.c b/cmd-list-clients.c
index 893a6d05..372b5283 100644
--- a/cmd-list-clients.c
+++ b/cmd-list-clients.c
@@ -51,7 +51,7 @@ cmd_list_clients_exec(struct cmd *self, struct cmd_q *cmdq)
 	struct session		*s;
 	struct format_tree	*ft;
 	const char		*template;
-	u_int			 i;
+	u_int			 idx;
 	char			*line;
 
 	if (args_has(args, 't')) {
@@ -64,16 +64,13 @@ cmd_list_clients_exec(struct cmd *self, struct cmd_q *cmdq)
 	if ((template = args_get(args, 'F')) == NULL)
 		template = LIST_CLIENTS_TEMPLATE;
 
-	for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
-		c = ARRAY_ITEM(&clients, i);
-		if (c == NULL || c->session == NULL)
-			continue;
-
-		if (s != NULL && s != c->session)
+	idx = 0;
+	TAILQ_FOREACH(c, &clients, entry) {
+		if (c->session == NULL || (s != NULL && s != c->session))
 			continue;
 
 		ft = format_create();
-		format_add(ft, "line", "%u", i);
+		format_add(ft, "line", "%u", idx);
 		format_defaults(ft, c, NULL, NULL, NULL);
 
 		line = format_expand(ft, template);
@@ -81,6 +78,8 @@ cmd_list_clients_exec(struct cmd *self, struct cmd_q *cmdq)
 		free(line);
 
 		format_free(ft);
+
+		idx++;
 	}
 
 	return (CMD_RETURN_NORMAL);
diff --git a/cmd-set-option.c b/cmd-set-option.c
index e0d1ae6c..83d31b93 100644
--- a/cmd-set-option.c
+++ b/cmd-set-option.c
@@ -91,7 +91,6 @@ cmd_set_option_exec(struct cmd *self, struct cmd_q *cmdq)
 	struct options				*oo;
 	struct window				*w;
 	const char				*optstr, *valstr;
-	u_int					 i;
 
 	/* Get the option name and value. */
 	optstr = args->argv[0];
@@ -186,9 +185,8 @@ cmd_set_option_exec(struct cmd *self, struct cmd_q *cmdq)
 
 	/* Update sizes and redraw. May not need it but meh. */
 	recalculate_sizes();
-	for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
-		c = ARRAY_ITEM(&clients, i);
-		if (c != NULL && c->session != NULL)
+	TAILQ_FOREACH(c, &clients, entry) {
+		if (c->session != NULL)
 			server_redraw_client(c);
 	}
 
diff --git a/cmd.c b/cmd.c
index 991e079b..b81ffb36 100644
--- a/cmd.c
+++ b/cmd.c
@@ -116,10 +116,12 @@ const struct cmd_entry *cmd_table[] = {
 	NULL
 };
 
+ARRAY_DECL(client_list, struct client *);
+
 int		 cmd_session_better(struct session *, struct session *, int);
 struct session	*cmd_choose_session_list(struct sessionslist *);
 struct session	*cmd_choose_session(int);
-struct client	*cmd_choose_client(struct clients *);
+struct client	*cmd_choose_client(struct client_list *);
 struct client	*cmd_lookup_client(const char *);
 struct session	*cmd_lookup_session(struct cmd_q *, const char *, int *);
 struct session	*cmd_lookup_session_id(const char *);
@@ -452,8 +454,7 @@ cmd_current_client(struct cmd_q *cmdq)
 {
 	struct session		*s;
 	struct client		*c;
-	struct clients		 cc;
-	u_int			 i;
+	struct client_list	 cc;
 
 	if (cmdq->client != NULL && cmdq->client->session != NULL)
 		return (cmdq->client);
@@ -465,9 +466,7 @@ cmd_current_client(struct cmd_q *cmdq)
 	s = cmd_current_session(cmdq, 0);
 	if (s != NULL && !(s->flags & SESSION_UNATTACHED)) {
 		ARRAY_INIT(&cc);
-		for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
-			if ((c = ARRAY_ITEM(&clients, i)) == NULL)
-				continue;
+		TAILQ_FOREACH(c, &clients, entry) {
 			if (s == c->session)
 				ARRAY_ADD(&cc, c);
 		}
@@ -478,12 +477,17 @@ cmd_current_client(struct cmd_q *cmdq)
 			return (c);
 	}
 
-	return (cmd_choose_client(&clients));
+	ARRAY_INIT(&cc);
+	TAILQ_FOREACH(c, &clients, entry)
+		ARRAY_ADD(&cc, c);
+	c = cmd_choose_client(&cc);
+	ARRAY_FREE(&cc);
+	return (c);
 }
 
 /* Choose the most recently used client from a list. */
 struct client *
-cmd_choose_client(struct clients *cc)
+cmd_choose_client(struct client_list *cc)
 {
 	struct client	*c, *cbest;
 	struct timeval	*tv = NULL;
@@ -615,11 +619,9 @@ cmd_lookup_client(const char *name)
 {
 	struct client	*c;
 	const char	*path;
-	u_int		 i;
 
-	for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
-		c = ARRAY_ITEM(&clients, i);
-		if (c == NULL || c->session == NULL || c->tty.path == NULL)
+	TAILQ_FOREACH(c, &clients, entry) {
+		if (c->session == NULL || c->tty.path == NULL)
 			continue;
 		path = c->tty.path;
 
diff --git a/control-notify.c b/control-notify.c
index 747ef5b4..943d670c 100644
--- a/control-notify.c
+++ b/control-notify.c
@@ -64,11 +64,9 @@ control_notify_window_layout_changed(struct window *w)
 	struct session		*s;
 	struct format_tree	*ft;
 	struct winlink		*wl;
-	u_int			 i;
 	const char		*template;
 
-	for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
-		c = ARRAY_ITEM(&clients, i);
+	TAILQ_FOREACH(c, &clients, entry) {
 		if (!CONTROL_SHOULD_NOTIFY_CLIENT(c) || c->session == NULL)
 			continue;
 		s = c->session;
@@ -100,10 +98,8 @@ control_notify_window_unlinked(unused struct session *s, struct window *w)
 {
 	struct client	*c;
 	struct session	*cs;
-	u_int		 i;
 
-	for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
-		c = ARRAY_ITEM(&clients, i);
+	TAILQ_FOREACH(c, &clients, entry) {
 		if (!CONTROL_SHOULD_NOTIFY_CLIENT(c) || c->session == NULL)
 			continue;
 		cs = c->session;
@@ -120,10 +116,8 @@ control_notify_window_linked(unused struct session *s, struct window *w)
 {
 	struct client	*c;
 	struct session	*cs;
-	u_int		 i;
 
-	for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
-		c = ARRAY_ITEM(&clients, i);
+	TAILQ_FOREACH(c, &clients, entry) {
 		if (!CONTROL_SHOULD_NOTIFY_CLIENT(c) || c->session == NULL)
 			continue;
 		cs = c->session;
@@ -140,10 +134,8 @@ control_notify_window_renamed(struct window *w)
 {
 	struct client	*c;
 	struct session	*cs;
-	u_int		 i;
 
-	for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
-		c = ARRAY_ITEM(&clients, i);
+	TAILQ_FOREACH(c, &clients, entry) {
 		if (!CONTROL_SHOULD_NOTIFY_CLIENT(c) || c->session == NULL)
 			continue;
 		cs = c->session;
@@ -174,10 +166,8 @@ void
 control_notify_session_renamed(struct session *s)
 {
 	struct client	*c;
-	u_int		 i;
 
-	for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
-		c = ARRAY_ITEM(&clients, i);
+	TAILQ_FOREACH(c, &clients, entry) {
 		if (!CONTROL_SHOULD_NOTIFY_CLIENT(c))
 			continue;
 
@@ -189,10 +179,8 @@ void
 control_notify_session_created(unused struct session *s)
 {
 	struct client	*c;
-	u_int		 i;
 
-	for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
-		c = ARRAY_ITEM(&clients, i);
+	TAILQ_FOREACH(c, &clients, entry) {
 		if (!CONTROL_SHOULD_NOTIFY_CLIENT(c))
 			continue;
 
@@ -204,10 +192,8 @@ void
 control_notify_session_close(unused struct session *s)
 {
 	struct client	*c;
-	u_int		 i;
 
-	for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
-		c = ARRAY_ITEM(&clients, i);
+	TAILQ_FOREACH(c, &clients, entry) {
 		if (!CONTROL_SHOULD_NOTIFY_CLIENT(c))
 			continue;
 
diff --git a/notify.c b/notify.c
index 75a16de9..19bf17e8 100644
--- a/notify.c
+++ b/notify.c
@@ -136,7 +136,6 @@ void
 notify_input(struct window_pane *wp, struct evbuffer *input)
 {
 	struct client	*c;
-	u_int		 i;
 
 	/*
 	 * notify_input() is not queued and only does anything when
@@ -145,9 +144,8 @@ notify_input(struct window_pane *wp, struct evbuffer *input)
 	if (!notify_enabled)
 		return;
 
-	for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
-		c = ARRAY_ITEM(&clients, i);
-		if (c != NULL && (c->flags & CLIENT_CONTROL))
+	TAILQ_FOREACH(c, &clients, entry) {
+		if (c->flags & CLIENT_CONTROL)
 			control_notify_input(c, wp, input);
 	}
 }
diff --git a/resize.c b/resize.c
index 330c37b5..3606bfeb 100644
--- a/resize.c
+++ b/resize.c
@@ -49,7 +49,7 @@ recalculate_sizes(void)
 	struct client		*c;
 	struct window		*w;
 	struct window_pane	*wp;
-	u_int			 i, ssx, ssy, has, limit;
+	u_int			 ssx, ssy, has, limit;
 	int			 flag, has_status, is_zoomed, forced;
 
 	RB_FOREACH(s, sessions, &sessions) {
@@ -57,9 +57,8 @@ recalculate_sizes(void)
 
 		s->attached = 0;
 		ssx = ssy = UINT_MAX;
-		for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
-			c = ARRAY_ITEM(&clients, i);
-			if (c == NULL || c->flags & CLIENT_SUSPENDED)
+		TAILQ_FOREACH(c, &clients, entry) {
+			if (c->flags & CLIENT_SUSPENDED)
 				continue;
 			if (c->session == s) {
 				if (c->tty.sx < ssx)
diff --git a/server-client.c b/server-client.c
index e2f65e71..a0f81b73 100644
--- a/server-client.c
+++ b/server-client.c
@@ -60,7 +60,6 @@ void
 server_client_create(int fd)
 {
 	struct client	*c;
-	u_int		 i;
 
 	setblocking(fd, 0);
 
@@ -108,13 +107,7 @@ server_client_create(int fd)
 
 	evtimer_set(&c->repeat_timer, server_client_repeat_timer, c);
 
-	for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
-		if (ARRAY_ITEM(&clients, i) == NULL) {
-			ARRAY_SET(&clients, i, c);
-			return;
-		}
-	}
-	ARRAY_ADD(&clients, c);
+	TAILQ_INSERT_TAIL(&clients, c, entry);
 	log_debug("new client %d", fd);
 }
 
@@ -148,10 +141,7 @@ server_client_lost(struct client *c)
 	struct message_entry	*msg;
 	u_int			 i;
 
-	for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
-		if (ARRAY_ITEM(&clients, i) == c)
-			ARRAY_SET(&clients, i, NULL);
-	}
+	TAILQ_REMOVE(&clients, c, entry);
 	log_debug("lost client %d", c->ibuf.fd);
 
 	/*
@@ -205,14 +195,7 @@ server_client_lost(struct client *c)
 	if (event_initialized(&c->event))
 		event_del(&c->event);
 
-	for (i = 0; i < ARRAY_LENGTH(&dead_clients); i++) {
-		if (ARRAY_ITEM(&dead_clients, i) == NULL) {
-			ARRAY_SET(&dead_clients, i, c);
-			break;
-		}
-	}
-	if (i == ARRAY_LENGTH(&dead_clients))
-		ARRAY_ADD(&dead_clients, c);
+	TAILQ_INSERT_TAIL(&dead_clients, c, entry);
 	c->flags |= CLIENT_DEAD;
 
 	server_add_accept(0); /* may be more file descriptors now */
@@ -263,16 +246,14 @@ server_client_status_timer(void)
 	struct client	*c;
 	struct session	*s;
 	struct timeval	 tv;
-	u_int		 i;
 	int		 interval;
 	time_t		 difference;
 
 	if (gettimeofday(&tv, NULL) != 0)
 		fatal("gettimeofday failed");
 
-	for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
-		c = ARRAY_ITEM(&clients, i);
-		if (c == NULL || c->session == NULL)
+	TAILQ_FOREACH(c, &clients, entry) {
+		if (c->session == NULL)
 			continue;
 		if (c->message_string != NULL || c->prompt_string != NULL) {
 			/*
@@ -702,13 +683,8 @@ server_client_loop(void)
 	struct client		*c;
 	struct window		*w;
 	struct window_pane	*wp;
-	u_int		 	 i;
-
-	for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
-		c = ARRAY_ITEM(&clients, i);
-		if (c == NULL)
-			continue;
 
+	TAILQ_FOREACH(c, &clients, entry) {
 		server_client_check_exit(c);
 		if (c->session != NULL) {
 			server_client_check_redraw(c);
@@ -755,7 +731,6 @@ server_client_check_resize(struct window_pane *wp)
 void
 server_client_check_focus(struct window_pane *wp)
 {
-	u_int		 i;
 	struct client	*c;
 	int		 push;
 
@@ -783,12 +758,8 @@ server_client_check_focus(struct window_pane *wp)
 	 * If our window is the current window in any focused clients with an
 	 * attached session, we're focused.
 	 */
-	for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
-		c = ARRAY_ITEM(&clients, i);
-		if (c == NULL || c->session == NULL)
-			continue;
-
-		if (!(c->flags & CLIENT_FOCUSED))
+	TAILQ_FOREACH(c, &clients, entry) {
+		if (c->session == NULL || !(c->flags & CLIENT_FOCUSED))
 			continue;
 		if (c->session->flags & SESSION_UNATTACHED)
 			continue;
diff --git a/server-fn.c b/server-fn.c
index c5487aa6..85067a87 100644
--- a/server-fn.c
+++ b/server-fn.c
@@ -77,12 +77,8 @@ server_write_session(struct session *s, enum msgtype type, const void *buf,
     size_t len)
 {
 	struct client	*c;
-	u_int		 i;
 
-	for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
-		c = ARRAY_ITEM(&clients, i);
-		if (c == NULL || c->session == NULL)
-			continue;
+	TAILQ_FOREACH(c, &clients, entry) {
 		if (c->session == s)
 			server_write_client(c, type, buf, len);
 	}
@@ -104,12 +100,8 @@ void
 server_redraw_session(struct session *s)
 {
 	struct client	*c;
-	u_int		 i;
 
-	for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
-		c = ARRAY_ITEM(&clients, i);
-		if (c == NULL || c->session == NULL)
-			continue;
+	TAILQ_FOREACH(c, &clients, entry) {
 		if (c->session == s)
 			server_redraw_client(c);
 	}
@@ -132,12 +124,8 @@ void
 server_status_session(struct session *s)
 {
 	struct client	*c;
-	u_int		 i;
 
-	for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
-		c = ARRAY_ITEM(&clients, i);
-		if (c == NULL || c->session == NULL)
-			continue;
+	TAILQ_FOREACH(c, &clients, entry) {
 		if (c->session == s)
 			server_status_client(c);
 	}
@@ -160,13 +148,9 @@ void
 server_redraw_window(struct window *w)
 {
 	struct client	*c;
-	u_int		 i;
 
-	for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
-		c = ARRAY_ITEM(&clients, i);
-		if (c == NULL || c->session == NULL)
-			continue;
-		if (c->session->curw->window == w)
+	TAILQ_FOREACH(c, &clients, entry) {
+		if (c->session != NULL && c->session->curw->window == w)
 			server_redraw_client(c);
 	}
 	w->flags |= WINDOW_REDRAW;
@@ -176,13 +160,9 @@ void
 server_redraw_window_borders(struct window *w)
 {
 	struct client	*c;
-	u_int		 i;
 
-	for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
-		c = ARRAY_ITEM(&clients, i);
-		if (c == NULL || c->session == NULL)
-			continue;
-		if (c->session->curw->window == w)
+	TAILQ_FOREACH(c, &clients, entry) {
+		if (c->session != NULL && c->session->curw->window == w)
 			c->flags |= CLIENT_BORDERS;
 	}
 }
@@ -208,13 +188,10 @@ void
 server_lock(void)
 {
 	struct client	*c;
-	u_int		 i;
 
-	for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
-		c = ARRAY_ITEM(&clients, i);
-		if (c == NULL || c->session == NULL)
-			continue;
-		server_lock_client(c);
+	TAILQ_FOREACH(c, &clients, entry) {
+		if (c->session != NULL)
+			server_lock_client(c);
 	}
 }
 
@@ -222,13 +199,10 @@ void
 server_lock_session(struct session *s)
 {
 	struct client	*c;
-	u_int		 i;
 
-	for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
-		c = ARRAY_ITEM(&clients, i);
-		if (c == NULL || c->session == NULL || c->session != s)
-			continue;
-		server_lock_client(c);
+	TAILQ_FOREACH(c, &clients, entry) {
+		if (c->session == s)
+			server_lock_client(c);
 	}
 }
 
@@ -430,16 +404,14 @@ server_destroy_session(struct session *s)
 {
 	struct client	*c;
 	struct session	*s_new;
-	u_int		 i;
 
 	if (!options_get_number(&s->options, "detach-on-destroy"))
 		s_new = server_next_session(s);
 	else
 		s_new = NULL;
 
-	for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
-		c = ARRAY_ITEM(&clients, i);
-		if (c == NULL || c->session != s)
+	TAILQ_FOREACH(c, &clients, entry) {
+		if (c->session != s)
 			continue;
 		if (s_new == NULL) {
 			c->session = NULL;
diff --git a/server-window.c b/server-window.c
index f157da35..4385dd90 100644
--- a/server-window.c
+++ b/server-window.c
@@ -58,7 +58,6 @@ server_window_check_bell(struct session *s, struct winlink *wl)
 {
 	struct client	*c;
 	struct window	*w = wl->window;
-	u_int		 i;
 	int		 action, visual;
 
 	if (!(w->flags & WINDOW_BELL) || wl->flags & WINLINK_BELL)
@@ -74,9 +73,8 @@ server_window_check_bell(struct session *s, struct winlink *wl)
 	action = options_get_number(&s->options, "bell-action");
 	if (action == BELL_NONE)
 		return (0);
-	for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
-		c = ARRAY_ITEM(&clients, i);
-		if (c == NULL || c->session != s || c->flags & CLIENT_CONTROL)
+	TAILQ_FOREACH(c, &clients, entry) {
+		if (c->session != s || c->flags & CLIENT_CONTROL)
 			continue;
 		if (!visual) {
 			if (c->session->curw->window == w || action == BELL_ANY)
@@ -98,7 +96,6 @@ server_window_check_activity(struct session *s, struct winlink *wl)
 {
 	struct client	*c;
 	struct window	*w = wl->window;
-	u_int		 i;
 
 	if (s->curw->window == w)
 		w->flags &= ~WINDOW_ACTIVITY;
@@ -116,9 +113,8 @@ server_window_check_activity(struct session *s, struct winlink *wl)
 	wl->flags |= WINLINK_ACTIVITY;
 
 	if (options_get_number(&s->options, "visual-activity")) {
-		for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
-			c = ARRAY_ITEM(&clients, i);
-			if (c == NULL || c->session != s)
+		TAILQ_FOREACH(c, &clients, entry) {
+			if (c->session != s)
 				continue;
 			status_message_set(c, "Activity in window %d", wl->idx);
 		}
@@ -134,7 +130,6 @@ server_window_check_silence(struct session *s, struct winlink *wl)
 	struct client	*c;
 	struct window	*w = wl->window;
 	struct timeval	 timer;
-	u_int		 i;
 	int		 silence_interval, timer_difference;
 
 	if (!(w->flags & WINDOW_SILENCE) || wl->flags & WINLINK_SILENCE)
@@ -167,9 +162,8 @@ server_window_check_silence(struct session *s, struct winlink *wl)
 	wl->flags |= WINLINK_SILENCE;
 
 	if (options_get_number(&s->options, "visual-silence")) {
-		for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
-			c = ARRAY_ITEM(&clients, i);
-			if (c == NULL || c->session != s)
+		TAILQ_FOREACH(c, &clients, entry) {
+			if (c->session != s)
 				continue;
 			status_message_set(c, "Silence in window %d", wl->idx);
 		}
@@ -183,11 +177,9 @@ void
 ring_bell(struct session *s)
 {
 	struct client	*c;
-	u_int		 i;
 
-	for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
-		c = ARRAY_ITEM(&clients, i);
-		if (c != NULL && c->session == s && !(c->flags & CLIENT_CONTROL))
+	TAILQ_FOREACH(c, &clients, entry) {
+		if (c->session == s && !(c->flags & CLIENT_CONTROL))
 			tty_bell(&c->tty);
 	}
 }
diff --git a/server.c b/server.c
index 1183d64d..ba161c4b 100644
--- a/server.c
+++ b/server.c
@@ -139,8 +139,8 @@ server_start(int lockfd, char *lockfile)
 
 	RB_INIT(&windows);
 	RB_INIT(&all_window_panes);
-	ARRAY_INIT(&clients);
-	ARRAY_INIT(&dead_clients);
+	TAILQ_INIT(&clients);
+	TAILQ_INIT(&dead_clients);
 	RB_INIT(&sessions);
 	RB_INIT(&dead_sessions);
 	TAILQ_INIT(&session_groups);
@@ -166,7 +166,7 @@ server_start(int lockfd, char *lockfile)
 	cfg_cmd_q->emptyfn = cfg_default_done;
 	cfg_finished = 0;
 	cfg_references = 1;
-	cfg_client = ARRAY_FIRST(&clients);
+	cfg_client = TAILQ_FIRST(&clients);
 	if (cfg_client != NULL)
 		cfg_client->references++;
 
@@ -212,16 +212,14 @@ int
 server_should_shutdown(void)
 {
 	struct client	*c;
-	u_int		 i;
 
 	if (!options_get_number(&global_options, "exit-unattached")) {
 		if (!RB_EMPTY(&sessions))
 			return (0);
 	}
 
-	for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
-		c = ARRAY_ITEM(&clients, i);
-		if (c != NULL && c->session != NULL)
+	TAILQ_FOREACH(c, &clients, entry) {
+		if (c->session != NULL)
 			return (0);
 	}
 
@@ -230,10 +228,8 @@ server_should_shutdown(void)
 	 * clients but don't actually exit until they've gone.
 	 */
 	cmd_wait_for_flush();
-	for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
-		if (ARRAY_ITEM(&clients, i) != NULL)
-			return (0);
-	}
+	if (!TAILQ_EMPTY(&clients))
+		return (0);
 
 	return (1);
 }
@@ -242,55 +238,42 @@ server_should_shutdown(void)
 void
 server_send_shutdown(void)
 {
-	struct client	*c;
-	struct session	*s, *next_s;
-	u_int		 i;
+	struct client	*c, *c1;
+	struct session	*s, *s1;
 
 	cmd_wait_for_flush();
 
-	for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
-		c = ARRAY_ITEM(&clients, i);
-		if (c != NULL) {
-			if (c->flags & (CLIENT_BAD|CLIENT_SUSPENDED))
-				server_client_lost(c);
-			else
-				server_write_client(c, MSG_SHUTDOWN, NULL, 0);
-			c->session = NULL;
-		}
+	TAILQ_FOREACH_SAFE(c, &clients, entry, c1) {
+		if (c->flags & (CLIENT_BAD|CLIENT_SUSPENDED))
+			server_client_lost(c);
+		else
+			server_write_client(c, MSG_SHUTDOWN, NULL, 0);
+		c->session = NULL;
 	}
 
-	s = RB_MIN(sessions, &sessions);
-	while (s != NULL) {
-		next_s = RB_NEXT(sessions, &sessions, s);
+	RB_FOREACH_SAFE(s, sessions, &sessions, s1)
 		session_destroy(s);
-		s = next_s;
-	}
 }
 
 /* Free dead, unreferenced clients and sessions. */
 void
 server_clean_dead(void)
 {
-	struct session	*s, *next_s;
-	struct client	*c;
-	u_int		 i;
+	struct session	*s, *s1;
+	struct client	*c, *c1;
 
-	s = RB_MIN(sessions, &dead_sessions);
-	while (s != NULL) {
-		next_s = RB_NEXT(sessions, &dead_sessions, s);
-		if (s->references == 0) {
-			RB_REMOVE(sessions, &dead_sessions, s);
-			free(s->name);
-			free(s);
-		}
-		s = next_s;
+	RB_FOREACH_SAFE(s, sessions, &dead_sessions, s1) {
+		if (s->references != 0)
+			continue;
+		RB_REMOVE(sessions, &dead_sessions, s);
+		free(s->name);
+		free(s);
 	}
 
-	for (i = 0; i < ARRAY_LENGTH(&dead_clients); i++) {
-		c = ARRAY_ITEM(&dead_clients, i);
-		if (c == NULL || c->references != 0)
+	TAILQ_FOREACH_SAFE(c, &dead_clients, entry, c1) {
+		if (c->references != 0)
 			continue;
-		ARRAY_SET(&dead_clients, i, NULL);
+		TAILQ_REMOVE(&dead_clients, c, entry);
 		free(c);
 	}
 }
diff --git a/tmux.h b/tmux.h
index 9a6e4c83..c38149ab 100644
--- a/tmux.h
+++ b/tmux.h
@@ -1349,8 +1349,10 @@ struct client {
 
 	struct cmd_q	*cmdq;
 	int		 references;
+
+	TAILQ_ENTRY(client) entry;
 };
-ARRAY_DECL(clients, struct client *);
+TAILQ_HEAD(clients, client);
 
 /* Parsed arguments structures. */
 struct args_entry {
diff --git a/tty.c b/tty.c
index a5067b12..aae7b893 100644
--- a/tty.c
+++ b/tty.c
@@ -708,7 +708,6 @@ tty_write(
 {
 	struct window_pane	*wp = ctx->wp;
 	struct client		*c;
-	u_int		 	 i;
 
 	/* wp can be NULL if updating the screen but not the terminal. */
 	if (wp == NULL)
@@ -719,9 +718,8 @@ tty_write(
 	if (!window_pane_visible(wp) || wp->flags & PANE_DROP)
 		return;
 
-	for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
-		c = ARRAY_ITEM(&clients, i);
-		if (c == NULL || c->session == NULL || c->tty.term == NULL)
+	TAILQ_FOREACH(c, &clients, entry) {
+		if (c->session == NULL || c->tty.term == NULL)
 			continue;
 		if (c->flags & CLIENT_SUSPENDED)
 			continue;