diff --git a/composite/compext.c b/composite/compext.c
index f4f1ed73d1..41a943a3fd 100644
--- a/composite/compext.c
+++ b/composite/compext.c
@@ -123,10 +123,8 @@ ProcCompositeQueryVersion(ClientPtr client)
     pCompositeClient->major_version = reply.majorVersion;
     pCompositeClient->minor_version = reply.minorVersion;
 
-    if (client->swapped) {
-        swapl(&reply.majorVersion);
-        swapl(&reply.minorVersion);
-    }
+    REPLY_FIELD_CARD32(majorVersion);
+    REPLY_FIELD_CARD32(minorVersion);
 
     return X_SEND_REPLY_SIMPLE(client, reply);
 }
@@ -303,9 +301,7 @@ SingleCompositeGetOverlayWindow(ClientPtr client, xCompositeGetOverlayWindowReq
         .overlayWin = cs->pOverlayWin->drawable.id
     };
 
-    if (client->swapped) {
-        swapl(&reply.overlayWin);
-    }
+    REPLY_FIELD_CARD32(overlayWin);
 
     return X_SEND_REPLY_SIMPLE(client, reply);
 }
@@ -743,9 +739,7 @@ ProcCompositeGetOverlayWindow(ClientPtr client)
         .overlayWin = cs->pOverlayWin->drawable.id
     };
 
-    if (client->swapped) {
-        swapl(&reply.overlayWin);
-    }
+    REPLY_FIELD_CARD32(overlayWin);
 
     return X_SEND_REPLY_SIMPLE(client, reply);
 #else