diff --git a/Xext/bigreq.c b/Xext/bigreq.c
index d01fa6bb2..e31e5923e 100644
--- a/Xext/bigreq.c
+++ b/Xext/bigreq.c
@@ -57,8 +57,8 @@ ProcBigReqDispatch(ClientPtr client)
     if (client->swapped) {
         swapl(&reply.max_request_size);
     }
-    X_SEND_REPLY_SIMPLE(client, reply);
-    return Success;
+
+    return X_SEND_REPLY_SIMPLE(client, reply);
 }
 
 void
diff --git a/Xext/damage/damageext.c b/Xext/damage/damageext.c
index e9c7aa38a..c16329823 100644
--- a/Xext/damage/damageext.c
+++ b/Xext/damage/damageext.c
@@ -239,8 +239,8 @@ ProcDamageQueryVersion(ClientPtr client)
         swapl(&rep.majorVersion);
         swapl(&rep.minorVersion);
     }
-    X_SEND_REPLY_SIMPLE(client, rep);
-    return Success;
+
+    return X_SEND_REPLY_SIMPLE(client, rep);
 }
 
 static void
diff --git a/Xext/dpms.c b/Xext/dpms.c
index c882765fe..b025cc3c1 100644
--- a/Xext/dpms.c
+++ b/Xext/dpms.c
@@ -324,8 +324,8 @@ ProcDPMSGetVersion(ClientPtr client)
         swaps(&reply.majorVersion);
         swaps(&reply.minorVersion);
     }
-    X_SEND_REPLY_SIMPLE(client, reply);
-    return Success;
+
+    return X_SEND_REPLY_SIMPLE(client, reply);
 }
 
 static int
@@ -338,8 +338,7 @@ ProcDPMSCapable(ClientPtr client)
 
     REQUEST_SIZE_MATCH(xDPMSCapableReq);
 
-    X_SEND_REPLY_SIMPLE(client, reply);
-    return Success;
+    return X_SEND_REPLY_SIMPLE(client, reply);
 }
 
 static int
@@ -359,8 +358,8 @@ ProcDPMSGetTimeouts(ClientPtr client)
         swaps(&reply.suspend);
         swaps(&reply.off);
     }
-    X_SEND_REPLY_SIMPLE(client, reply);
-    return Success;
+
+    return X_SEND_REPLY_SIMPLE(client, reply);
 }
 
 static int
diff --git a/Xext/geext.c b/Xext/geext.c
index bf7aa7c86..76bffa255 100644
--- a/Xext/geext.c
+++ b/Xext/geext.c
@@ -92,8 +92,7 @@ ProcGEQueryVersion(ClientPtr client)
         swaps(&reply.minorVersion);
     }
 
-    X_SEND_REPLY_SIMPLE(client, reply);
-    return Success;
+    return X_SEND_REPLY_SIMPLE(client, reply);
 }
 
 /************************************************************/
diff --git a/Xext/panoramiX.c b/Xext/panoramiX.c
index 012d6efbb..a144d794e 100644
--- a/Xext/panoramiX.c
+++ b/Xext/panoramiX.c
@@ -891,8 +891,8 @@ ProcPanoramiXQueryVersion(ClientPtr client)
         swaps(&reply.majorVersion);
         swaps(&reply.minorVersion);
     }
-    X_SEND_REPLY_SIMPLE(client, reply);
-    return Success;
+
+    return X_SEND_REPLY_SIMPLE(client, reply);
 }
 
 int
@@ -919,9 +919,8 @@ ProcPanoramiXGetState(ClientPtr client)
     if (client->swapped) {
         swapl(&reply.window);
     }
-    X_SEND_REPLY_SIMPLE(client, reply);
-    return Success;
 
+    return X_SEND_REPLY_SIMPLE(client, reply);
 }
 
 int
@@ -948,8 +947,8 @@ ProcPanoramiXGetScreenCount(ClientPtr client)
     if (client->swapped) {
         swapl(&reply.window);
     }
-    X_SEND_REPLY_SIMPLE(client, reply);
-    return Success;
+
+    return X_SEND_REPLY_SIMPLE(client, reply);
 }
 
 int
@@ -989,8 +988,8 @@ ProcPanoramiXGetScreenSize(ClientPtr client)
         swapl(&reply.window);
         swapl(&reply.screen);
     }
-    X_SEND_REPLY_SIMPLE(client, reply);
-    return Success;
+
+    return X_SEND_REPLY_SIMPLE(client, reply);
 }
 
 int
@@ -1012,8 +1011,8 @@ ProcXineramaIsActive(ClientPtr client)
     if (client->swapped) {
         swapl(&reply.state);
     }
-    X_SEND_REPLY_SIMPLE(client, reply);
-    return Success;
+
+    return X_SEND_REPLY_SIMPLE(client, reply);
 }
 
 int
diff --git a/Xext/panoramiXprocs.c b/Xext/panoramiXprocs.c
index ad5b054d7..8ac8dda0d 100644
--- a/Xext/panoramiXprocs.c
+++ b/Xext/panoramiXprocs.c
@@ -615,8 +615,8 @@ PanoramiXGetGeometry(ClientPtr client)
         swaps(&reply.height);
         swaps(&reply.borderWidth);
     }
-    X_SEND_REPLY_SIMPLE(client, reply);
-    return Success;
+
+    return X_SEND_REPLY_SIMPLE(client, reply);
 }
 
 int
@@ -696,8 +696,8 @@ PanoramiXTranslateCoords(ClientPtr client)
         swaps(&reply.dstX);
         swaps(&reply.dstY);
     }
-    X_SEND_REPLY_SIMPLE(client, reply);
-    return Success;
+
+    return X_SEND_REPLY_SIMPLE(client, reply);
 }
 
 int
diff --git a/Xext/saver.c b/Xext/saver.c
index 2b1e4c505..2505468b4 100644
--- a/Xext/saver.c
+++ b/Xext/saver.c
@@ -599,8 +599,8 @@ ProcScreenSaverQueryVersion(ClientPtr client)
         swaps(&reply.majorVersion);
         swaps(&reply.minorVersion);
     }
-    X_SEND_REPLY_SIMPLE(client, reply);
-    return Success;
+
+    return X_SEND_REPLY_SIMPLE(client, reply);
 }
 
 static int
@@ -664,8 +664,8 @@ ProcScreenSaverQueryInfo(ClientPtr client)
         swapl(&reply.idle);
         swapl(&reply.eventMask);
     }
-    X_SEND_REPLY_SIMPLE(client, reply);
-    return Success;
+
+    return X_SEND_REPLY_SIMPLE(client, reply);
 }
 
 static int
diff --git a/Xext/security.c b/Xext/security.c
index 411b71fef..f4889e0fa 100644
--- a/Xext/security.c
+++ b/Xext/security.c
@@ -364,8 +364,8 @@ ProcSecurityQueryVersion(ClientPtr client)
         swaps(&reply.majorVersion);
         swaps(&reply.minorVersion);
     }
-    X_SEND_REPLY_SIMPLE(client, reply);
-    return Success;
+
+    return X_SEND_REPLY_SIMPLE(client, reply);
 }                               /* ProcSecurityQueryVersion */
 
 static int
diff --git a/Xext/shape.c b/Xext/shape.c
index 1ad6edd7f..be90895fc 100644
--- a/Xext/shape.c
+++ b/Xext/shape.c
@@ -217,8 +217,8 @@ ProcShapeQueryVersion(ClientPtr client)
         swaps(&reply.majorVersion);
         swaps(&reply.minorVersion);
     }
-    X_SEND_REPLY_SIMPLE(client, reply);
-    return Success;
+
+    return X_SEND_REPLY_SIMPLE(client, reply);
 }
 
 static int
@@ -706,8 +706,8 @@ ProcShapeQueryExtents(ClientPtr client)
         swaps(&reply.widthClipShape);
         swaps(&reply.heightClipShape);
     }
-    X_SEND_REPLY_SIMPLE(client, reply);
-    return Success;
+
+    return X_SEND_REPLY_SIMPLE(client, reply);
 }
 
  /*ARGSUSED*/ static int
@@ -961,8 +961,7 @@ ProcShapeInputSelected(ClientPtr client)
         .enabled = enabled,
     };
 
-    X_SEND_REPLY_SIMPLE(client, reply);
-    return Success;
+    return X_SEND_REPLY_SIMPLE(client, reply);
 }
 
 static int
diff --git a/Xext/shm.c b/Xext/shm.c
index ccccb0d48..82c36514e 100644
--- a/Xext/shm.c
+++ b/Xext/shm.c
@@ -272,8 +272,8 @@ ProcShmQueryVersion(ClientPtr client)
         swaps(&reply.uid);
         swaps(&reply.gid);
     }
-    X_SEND_REPLY_SIMPLE(client, reply);
-    return Success;
+
+    return X_SEND_REPLY_SIMPLE(client, reply);
 }
 
 /*
@@ -698,8 +698,8 @@ ShmGetImage(ClientPtr client, xShmGetImageReq *stuff)
         swapl(&xgi.visual);
         swapl(&xgi.size);
     }
-    X_SEND_REPLY_SIMPLE(client, xgi);
-    return Success;
+
+    return X_SEND_REPLY_SIMPLE(client, xgi);
 }
 
 static int
@@ -894,8 +894,8 @@ ProcShmGetImage(ClientPtr client)
         swapl(&xgi.visual);
         swapl(&xgi.size);
     }
-    X_SEND_REPLY_SIMPLE(client, xgi);
-    return Success;
+
+    return X_SEND_REPLY_SIMPLE(client, xgi);
 #else
     return ShmGetImage(client, stuff);
 #endif /* XINERAMA */
@@ -1321,8 +1321,8 @@ ProcShmCreateSegment(ClientPtr client)
         close(fd);
         return BadAlloc;
     }
-    X_SEND_REPLY_SIMPLE(client, reply);
-    return Success;
+
+    return X_SEND_REPLY_SIMPLE(client, reply);
 }
 #endif /* SHM_FD_PASSING */
 
diff --git a/Xext/sync.c b/Xext/sync.c
index 2bfd45679..885d42036 100644
--- a/Xext/sync.c
+++ b/Xext/sync.c
@@ -1269,8 +1269,7 @@ ProcSyncInitialize(ClientPtr client)
 
     REQUEST_SIZE_MATCH(xSyncInitializeReq);
 
-    X_SEND_REPLY_SIMPLE(client, reply);
-    return Success;
+    return X_SEND_REPLY_SIMPLE(client, reply);
 }
 
 /*
@@ -1391,8 +1390,7 @@ ProcSyncGetPriority(ClientPtr client)
         swapl(&reply.priority);
     }
 
-    X_SEND_REPLY_SIMPLE(client, reply);
-    return Success;
+    return X_SEND_REPLY_SIMPLE(client, reply);
 }
 
 /*
@@ -1699,8 +1697,8 @@ ProcSyncQueryCounter(ClientPtr client)
         swapl(&reply.value_hi);
         swapl(&reply.value_lo);
     }
-    X_SEND_REPLY_SIMPLE(client, reply);
-    return Success;
+
+    return X_SEND_REPLY_SIMPLE(client, reply);
 }
 
 /*
@@ -1894,8 +1892,7 @@ ProcSyncQueryAlarm(ClientPtr client)
         swapl(&reply.delta_lo);
     }
 
-    X_SEND_REPLY_SIMPLE(client, reply);
-    return Success;
+    return X_SEND_REPLY_SIMPLE(client, reply);
 }
 
 static int
@@ -2059,8 +2056,7 @@ ProcSyncQueryFence(ClientPtr client)
         .triggered = pFence->funcs.CheckTriggered(pFence)
     };
 
-    X_SEND_REPLY_SIMPLE(client, reply);
-    return Success;
+    return X_SEND_REPLY_SIMPLE(client, reply);
 }
 
 static int
diff --git a/Xext/vidmode.c b/Xext/vidmode.c
index b267bb410..7f66aded2 100644
--- a/Xext/vidmode.c
+++ b/Xext/vidmode.c
@@ -208,8 +208,8 @@ ProcVidModeQueryVersion(ClientPtr client)
         swaps(&reply.majorVersion);
         swaps(&reply.minorVersion);
     }
-    X_SEND_REPLY_SIMPLE(client, reply);
-    return Success;
+
+    return X_SEND_REPLY_SIMPLE(client, reply);
 }
 
 static int
@@ -297,12 +297,10 @@ ProcVidModeGetModeLine(ClientPtr client)
             .flags = reply.flags,
             .privsize = reply.privsize
         };
-        X_SEND_REPLY_SIMPLE(client, oldrep);
+        return X_SEND_REPLY_SIMPLE(client, oldrep);
     }
-    else {
-        X_SEND_REPLY_SIMPLE(client, reply);
-    }
-    return Success;
+
+    return X_SEND_REPLY_SIMPLE(client, reply);
 }
 
 static void fillModeInfoV1(x_rpcbuf_t *rpcbuf, int dotClock,
@@ -1150,10 +1148,10 @@ VidModeValidateModeLine(ClientPtr client, xXF86VidModeValidateModeLineReq *stuff
     if (client->swapped) {
         swapl(&reply.status);
     }
-    X_SEND_REPLY_SIMPLE(client, reply);
+
     DebugF("ValidateModeLine - Succeeded (status = %d)\n", status);
 
-    return Success;
+    return X_SEND_REPLY_SIMPLE(client, reply);
 }
 
 static int
@@ -1442,8 +1440,8 @@ ProcVidModeGetViewPort(ClientPtr client)
         swapl(&reply.x);
         swapl(&reply.y);
     }
-    X_SEND_REPLY_SIMPLE(client, reply);
-    return Success;
+
+    return X_SEND_REPLY_SIMPLE(client, reply);
 }
 
 static int
@@ -1613,8 +1611,8 @@ ProcVidModeGetGamma(ClientPtr client)
         swapl(&reply.green);
         swapl(&reply.blue);
     }
-    X_SEND_REPLY_SIMPLE(client, reply);
-    return Success;
+
+    return X_SEND_REPLY_SIMPLE(client, reply);
 }
 
 static int
@@ -1767,8 +1765,8 @@ ProcVidModeGetPermissions(ClientPtr client)
     if (client->swapped) {
         swapl(&reply.permissions);
     }
-    X_SEND_REPLY_SIMPLE(client, reply);
-    return Success;
+
+    return X_SEND_REPLY_SIMPLE(client, reply);
 }
 
 static int
diff --git a/Xext/xcmisc.c b/Xext/xcmisc.c
index d61b89739..47b5bf7c4 100644
--- a/Xext/xcmisc.c
+++ b/Xext/xcmisc.c
@@ -64,8 +64,8 @@ ProcXCMiscGetVersion(ClientPtr client)
         swaps(&reply.majorVersion);
         swaps(&reply.minorVersion);
     }
-    X_SEND_REPLY_SIMPLE(client, reply);
-    return Success;
+
+    return X_SEND_REPLY_SIMPLE(client, reply);
 }
 
 static int
@@ -84,8 +84,8 @@ ProcXCMiscGetXIDRange(ClientPtr client)
         swapl(&reply.start_id);
         swapl(&reply.count);
     }
-    X_SEND_REPLY_SIMPLE(client, reply);
-    return Success;
+
+    return X_SEND_REPLY_SIMPLE(client, reply);
 }
 
 static int
diff --git a/Xext/xres.c b/Xext/xres.c
index 08f598daa..e51c5b954 100644
--- a/Xext/xres.c
+++ b/Xext/xres.c
@@ -192,8 +192,8 @@ ProcXResQueryVersion(ClientPtr client)
         swaps(&reply.server_major);
         swaps(&reply.server_minor);
     }
-    X_SEND_REPLY_SIMPLE(client, reply);
-    return Success;
+
+    return X_SEND_REPLY_SIMPLE(client, reply);
 }
 
 static int
@@ -339,8 +339,8 @@ ProcXResQueryClientPixmapBytes(ClientPtr client)
         swapl(&reply.bytes);
         swapl(&reply.bytes_overflow);
     }
-    X_SEND_REPLY_SIMPLE(client, reply);
-    return Success;
+
+    return X_SEND_REPLY_SIMPLE(client, reply);
 }
 
 /** @brief Finds out if a client's information need to be put into the
diff --git a/Xext/xvmc.c b/Xext/xvmc.c
index 74ce8322c..bd24bb39d 100644
--- a/Xext/xvmc.c
+++ b/Xext/xvmc.c
@@ -123,8 +123,7 @@ ProcXvMCQueryVersion(ClientPtr client)
         swapl(&reply.minor);
     }
 
-    X_SEND_REPLY_SIMPLE(client, reply);
-    return Success;
+    return X_SEND_REPLY_SIMPLE(client, reply);
 }
 
 static int