diff --git a/glx/glxcmds.c b/glx/glxcmds.c
index ecd4e1f3eb..b16dad9225 100644
--- a/glx/glxcmds.c
+++ b/glx/glxcmds.c
@@ -717,8 +717,7 @@ __glXDisp_IsDirect(__GLXclientState * cl, GLbyte * pc)
         .isDirect = glxc->isDirect
     };
 
-    X_SEND_REPLY_SIMPLE(client, reply);
-    return Success;
+    return X_SEND_REPLY_SIMPLE(client, reply);
 }
 
 int
@@ -749,8 +748,7 @@ __glXDisp_QueryVersion(__GLXclientState * cl, GLbyte * pc)
         swapl(&reply.minorVersion);
     }
 
-    X_SEND_REPLY_SIMPLE(client, reply);
-    return Success;
+    return X_SEND_REPLY_SIMPLE(client, reply);
 }
 
 int
diff --git a/glx/vndcmds.c b/glx/vndcmds.c
index a79f8e9cf1..5674b336f8 100644
--- a/glx/vndcmds.c
+++ b/glx/vndcmds.c
@@ -98,8 +98,7 @@ static int dispatch_GLXQueryVersion(ClientPtr client)
     reply.majorVersion = GlxCheckSwap(client, 1);
     reply.minorVersion = GlxCheckSwap(client, 4);
 
-    X_SEND_REPLY_SIMPLE(client, reply);
-    return Success;
+    return X_SEND_REPLY_SIMPLE(client, reply);
 }
 
 /* broken header workaround */
@@ -254,8 +253,8 @@ static int CommonMakeCurrent(ClientPtr client,
     }
 
     reply.contextTag = GlxCheckSwap(client, reply.contextTag);
-    X_SEND_REPLY_SIMPLE(client, reply);
-    return Success;
+
+    return X_SEND_REPLY_SIMPLE(client, reply);
 }
 
 static int dispatch_GLXMakeCurrent(ClientPtr client)