diff --git a/src/fq.cpp b/src/fq.cpp
index b7bad6d9..2b2dae8d 100644
--- a/src/fq.cpp
+++ b/src/fq.cpp
@@ -75,7 +75,7 @@ int zmq::fq_t::recvpipe (msg_t *msg_, pipe_t **pipe_)
     errno_assert (rc == 0);
 
     //  Round-robin over the pipes to get the next message.
-    for (pipes_t::size_type count = active; count != 0; count--) {
+    while (active > 0) {
 
         //  Try to fetch new message. If we've already read part of the message
         //  subsequent part should be immediately available.
@@ -84,7 +84,7 @@ int zmq::fq_t::recvpipe (msg_t *msg_, pipe_t **pipe_)
         //  Check the atomicity of the message. If we've already received the
         //  first part of the message we should get the remaining parts
         //  without blocking.
-        zmq_assert (!(more && !fetched));
+        zmq_assert (!more || fetched);
 
         //  Note that when message is not fetched, current pipe is deactivated
         //  and replaced by another active pipe. Thus we don't have to increase
@@ -92,21 +92,16 @@ int zmq::fq_t::recvpipe (msg_t *msg_, pipe_t **pipe_)
         if (fetched) {
             if (pipe_)
                 *pipe_ = pipes [current];
-            more =
-                msg_->flags () & msg_t::more ? true : false;
-            if (!more) {
-                current++;
-                if (current >= active)
-                    current = 0;
-            }
+            more = msg_->flags () & msg_t::more? true: false;
+            if (!more)
+                current = (current + 1) % active;
             return 0;
         }
-        else {
-            active--;
-            pipes.swap (current, active);
-            if (current == active)
-                current = 0;
-        }
+
+        active--;
+        pipes.swap (current, active);
+        if (current == active)
+            current = 0;
     }
 
     //  No message is available. Initialise the output parameter
@@ -127,7 +122,7 @@ bool zmq::fq_t::has_in ()
     //  queueing algorithm. If there are no messages available current will
     //  get back to its original value. Otherwise it'll point to the first
     //  pipe holding messages, skipping only pipes with no messages available.
-    for (pipes_t::size_type count = active; count != 0; count--) {
+    while (active > 0) {
         if (pipes [current]->check_read ())
             return true;