--- a/client.c	Tue Aug 01 15:29:37 2006 +0200
+++ b/client.c	Tue Aug 01 16:14:17 2006 +0200
@@ -416,20 +416,18 @@
 void
 unmanage(Client *c)
 {
-	Client **l;
-
 	XGrabServer(dpy);
 	XSetErrorHandler(xerrordummy);
 
 	XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
 	XDestroyWindow(dpy, c->title);
 
-	for(l = &clients; *l && *l != c; l = &(*l)->next);
 	if(c->prev)
 		c->prev->next = c->next;
 	if(c->next)
 		c->next->prev = c->prev;
-	*l = c->next;
+	if(c == clients)
+		clients = c->next;
 	if(sel == c) {
 		sel = getnext(c->next);
 		if(!sel)
@@ -450,7 +448,7 @@
 void
 zoom(Arg *arg)
 {
-	Client *c, **l;
+	Client *c;
 
 	if(!sel)
 		return;
@@ -461,13 +459,10 @@
 	}
 
 	/* pop */
-	for(l = &clients; *l && *l != sel; l = &(*l)->next);
 	if(sel->prev)
 		sel->prev->next = sel->next;
 	if(sel->next)
 		sel->next->prev = sel->prev;
-	*l = sel->next;
-
 	sel->prev = NULL;
 	if(clients)
 		clients->prev = sel;