diff --git a/dbe/dbe.c b/dbe/dbe.c
index d9217f7c4a..178c1c47fc 100644
--- a/dbe/dbe.c
+++ b/dbe/dbe.c
@@ -112,19 +112,16 @@ DbeStubScreen(DbeScreenPrivPtr pDbeScreenPriv, int *nStubbedScreens)
 static int
 ProcDbeGetVersion(ClientPtr client)
 {
-    /* REQUEST(xDbeGetVersionReq); */
+    REQUEST_SIZE_MATCH(xDbeGetVersionReq);
+
     xDbeGetVersionReply rep = {
         .majorVersion = DBE_MAJOR_VERSION,
         .minorVersion = DBE_MINOR_VERSION
     };
 
-    REQUEST_SIZE_MATCH(xDbeGetVersionReq);
+    return X_SEND_REPLY_SIMPLE(client, rep);
+}
 
-    X_SEND_REPLY_SIMPLE(client, rep);
-    return Success;
-
-}                               /* ProcDbeGetVersion() */
-
 /******************************************************************************
  *
  * DBE DIX Procedure: ProcDbeAllocateBackBufferName
@@ -712,10 +709,9 @@ ProcDbeGetBackBufferAttributes(ClientPtr client)
         swapl(&rep.attributes);
     }
 
-    X_SEND_REPLY_SIMPLE(client, rep);
-    return Success;
-}                               /* ProcDbeGetbackBufferAttributes() */
-
+    return X_SEND_REPLY_SIMPLE(client, rep);
+}
+
 /******************************************************************************
  *
  * DBE DIX Procedure: ProcDbeDispatch