if(!matched)
                for(i = 0; i < ntags; i++)
                        c->tags[i] = seltag[i];
-       if(!c->isfloat)
-               for(c->weight = 0; c->weight < ntags && !c->tags[c->weight]; c->weight++);
+       for(c->weight = 0; c->weight < ntags && !c->tags[c->weight]; c->weight++);
 }
 
 void
        for(i = 0; i < ntags; i++)
                sel->tags[i] = False;
        sel->tags[arg->i] = True;
-       if(!sel->isfloat)
-               sel->weight = arg->i;
+       sel->weight = arg->i;
        arrange(NULL);
 }
 
        for(i = 0; i < ntags && !sel->tags[i]; i++);
        if(i == ntags)
                sel->tags[arg->i] = True;
-       if(!sel->isfloat)
-               sel->weight = (i == ntags) ? arg->i : i;
+       sel->weight = (i == ntags) ? arg->i : i;
        arrange(NULL);
 }
 
        clients = newclients;
 }
 
+static Client *
+nexttiled(Client *c)
+{
+       for(c = getnext(c->next); c && c->isfloat; c = getnext(c->next));
+       return c;
+}
+
 /* extern */
 
 void (*arrange)(Arg *) = DEFMODE;
        maximized = False;
 
        w = sw - mw;
-       for(n = 0, c = clients; c && !c->isfloat; c = c->next)
-               if(isvisible(c))
+       for(n = 0, c = clients; c; c = c->next)
+               if(isvisible(c) && !c->isfloat)
                        n++;
 
        if(n > 1)
        unsigned int n;
        Client *c;
 
-       for(n = 0, c = clients; c && !c->isfloat; c = c->next)
-               if(isvisible(c))
+       for(n = 0, c = clients; c; c = c->next)
+               if(isvisible(c) && !c->isfloat)
                        n++;
        if(!sel || sel->isfloat || n < 2 || (arrange != dotile) || maximized)
                return;
        unsigned int n;
        Client *c;
 
-       for(n = 0, c = clients; c && !c->isfloat; c = c->next)
-               if(isvisible(c))
+       for(n = 0, c = clients; c; c = c->next)
+               if(isvisible(c) && !c->isfloat)
                        n++;
        if(!sel || sel->isfloat || n < 2 || (arrange != dotile) || maximized)
                return;
 
-       if((c = sel) == getnext(clients))
-               if(!(c = getnext(c->next)) || c->isfloat)
+       if((c = sel) == nexttiled(clients))
+               if(!(c = nexttiled(c)))
                        return;
        detach(c);
        c->next = clients;