diff --git a/Xext/xres.c b/Xext/xres.c
index 1672f23d08..63983a68c3 100644
--- a/Xext/xres.c
+++ b/Xext/xres.c
@@ -420,7 +420,7 @@ ConstructClientIdValue(ClientPtr sendClient, ClientPtr client, CARD32 mask,
             REPLY_FIELD_CARD32(spec.mask);
             REPLY_FIELD_CARD32(length);    // need to do it, since not calling REPLY_SEND()
 
-            if (sendClient->swapped) swapl (value);
+            REPLY_BUF_CARD32(value, 1);
 
             memcpy(ptr, &rep, sizeof(rep));
             *value = pid;
diff --git a/dbe/dbe.c b/dbe/dbe.c
index 020ea94e18..f179b5079e 100644
--- a/dbe/dbe.c
+++ b/dbe/dbe.c
@@ -625,9 +625,7 @@ ProcDbeGetVisualInfo(ClientPtr client)
         .m = count
     };
 
-    if (client->swapped) {
-        swapl(&reply.m);
-    }
+    REPLY_FIELD_CARD32(m);
 
     rc = X_SEND_REPLY_WITH_RPCBUF(client, reply, rpcbuf);
 
@@ -675,9 +673,7 @@ ProcDbeGetBackBufferAttributes(ClientPtr client)
         reply.attributes = None;
     }
 
-    if (client->swapped) {
-        swapl(&reply.attributes);
-    }
+    REPLY_FIELD_CARD32(attributes);
 
     return X_SEND_REPLY_SIMPLE(client, reply);
 }