diff --git a/randr/rrsdispatch.c b/randr/rrsdispatch.c
index c163d6317..db536c49b 100644
--- a/randr/rrsdispatch.c
+++ b/randr/rrsdispatch.c
@@ -605,6 +605,8 @@ SProcRRFreeLease(ClientPtr client) {
     return ProcRRFreeLease(client);
 }
 
+#define HANDLER(name) case X_##name: return SProc##name(client)
+
 int
 SProcRRDispatch(ClientPtr client)
 {
@@ -612,61 +614,61 @@ SProcRRDispatch(ClientPtr client)
     UpdateCurrentTimeIf();
 
     switch (stuff->data) {
-        case X_RRQueryVersion:              return SProcRRQueryVersion(client);
-        case X_RRSetScreenConfig:           return SProcRRSetScreenConfig(client);
-        case X_RRSelectInput:               return SProcRRSelectInput(client);
-        case X_RRGetScreenInfo:             return SProcRRGetScreenInfo(client);
+        HANDLER(RRQueryVersion);
+        HANDLER(RRSetScreenConfig);
+        HANDLER(RRSelectInput);
+        HANDLER(RRGetScreenInfo);
 
         /* V1.2 additions */
-        case X_RRGetScreenSizeRange:        return SProcRRGetScreenSizeRange(client);
-        case X_RRSetScreenSize:             return SProcRRSetScreenSize(client);
-        case X_RRGetScreenResources:        return SProcRRGetScreenResources(client);
-        case X_RRGetOutputInfo:             return SProcRRGetOutputInfo(client);
-        case X_RRListOutputProperties:      return SProcRRListOutputProperties(client);
-        case X_RRQueryOutputProperty:       return SProcRRQueryOutputProperty(client);
-        case X_RRConfigureOutputProperty:   return SProcRRConfigureOutputProperty(client);
-        case X_RRChangeOutputProperty:      return SProcRRChangeOutputProperty(client);
-        case X_RRDeleteOutputProperty:      return SProcRRDeleteOutputProperty(client);
-        case X_RRGetOutputProperty:         return SProcRRGetOutputProperty(client);
-        case X_RRCreateMode:                return SProcRRCreateMode(client);
-        case X_RRDestroyMode:               return SProcRRDestroyMode(client);
-        case X_RRAddOutputMode:             return SProcRRAddOutputMode(client);
-        case X_RRDeleteOutputMode:          return SProcRRDeleteOutputMode(client);
-        case X_RRGetCrtcInfo:               return SProcRRGetCrtcInfo(client);
-        case X_RRSetCrtcConfig:             return SProcRRSetCrtcConfig(client);
-        case X_RRGetCrtcGammaSize:          return SProcRRGetCrtcGammaSize(client);
-        case X_RRGetCrtcGamma:              return SProcRRGetCrtcGamma(client);
-        case X_RRSetCrtcGamma:              return SProcRRSetCrtcGamma(client);
+        HANDLER(RRGetScreenSizeRange);
+        HANDLER(RRSetScreenSize);
+        HANDLER(RRGetScreenResources);
+        HANDLER(RRGetOutputInfo);
+        HANDLER(RRListOutputProperties);
+        HANDLER(RRQueryOutputProperty);
+        HANDLER(RRConfigureOutputProperty);
+        HANDLER(RRChangeOutputProperty);
+        HANDLER(RRDeleteOutputProperty);
+        HANDLER(RRGetOutputProperty);
+        HANDLER(RRCreateMode);
+        HANDLER(RRDestroyMode);
+        HANDLER(RRAddOutputMode);
+        HANDLER(RRDeleteOutputMode);
+        HANDLER(RRGetCrtcInfo);
+        HANDLER(RRSetCrtcConfig);
+        HANDLER(RRGetCrtcGammaSize);
+        HANDLER(RRGetCrtcGamma);
+        HANDLER(RRSetCrtcGamma);
 
         /* V1.3 additions */
-        case X_RRGetScreenResourcesCurrent: return SProcRRGetScreenResourcesCurrent(client);
-        case X_RRSetCrtcTransform:          return SProcRRSetCrtcTransform(client);
-        case X_RRGetCrtcTransform:          return SProcRRGetCrtcTransform(client);
-        case X_RRGetPanning:                return SProcRRGetPanning(client);
-        case X_RRSetPanning:                return SProcRRSetPanning(client);
-        case X_RRSetOutputPrimary:          return SProcRRSetOutputPrimary(client);
-        case X_RRGetOutputPrimary:          return SProcRRGetOutputPrimary(client);
+        HANDLER(RRGetScreenResourcesCurrent);
+        HANDLER(RRSetCrtcTransform);
+        HANDLER(RRGetCrtcTransform);
+        HANDLER(RRGetPanning);
+        HANDLER(RRSetPanning);
+        HANDLER(RRSetOutputPrimary);
+        HANDLER(RRGetOutputPrimary);
 
         /* V1.4 additions */
-        case X_RRGetProviders:              return SProcRRGetProviders(client);
-        case X_RRGetProviderInfo:           return SProcRRGetProviderInfo(client);
-        case X_RRSetProviderOffloadSink:    return SProcRRSetProviderOffloadSink(client);
-        case X_RRSetProviderOutputSource:   return SProcRRSetProviderOutputSource(client);
-        case X_RRListProviderProperties:    return SProcRRListProviderProperties(client);
-        case X_RRQueryProviderProperty:     return SProcRRQueryProviderProperty(client);
-        case X_RRConfigureProviderProperty: return SProcRRConfigureProviderProperty(client);
-        case X_RRChangeProviderProperty:    return SProcRRChangeProviderProperty(client);
-        case X_RRDeleteProviderProperty:    return SProcRRDeleteProviderProperty(client);
-        case X_RRGetProviderProperty:       return SProcRRGetProviderProperty(client);
+        HANDLER(RRGetProviders);
+        HANDLER(RRGetProviderInfo);
+        HANDLER(RRSetProviderOffloadSink);
+        HANDLER(RRSetProviderOutputSource);
+        HANDLER(RRListProviderProperties);
+        HANDLER(RRQueryProviderProperty);
+        HANDLER(RRConfigureProviderProperty);
+        HANDLER(RRChangeProviderProperty);
+        HANDLER(RRDeleteProviderProperty);
+        HANDLER(RRGetProviderProperty);
 
         /* V1.5 additions */
-        case X_RRGetMonitors:               return SProcRRGetMonitors(client);
-        case X_RRSetMonitor:                return SProcRRSetMonitor(client);
-        case X_RRDeleteMonitor:             return SProcRRDeleteMonitor(client);
+        HANDLER(RRGetMonitors);
+        HANDLER(RRSetMonitor);
+        HANDLER(RRDeleteMonitor);
 
         /* V1.6 additions */
-        case X_RRCreateLease:               return SProcRRCreateLease(client);
-        case X_RRFreeLease:                 return SProcRRFreeLease(client);
+        HANDLER(RRCreateLease);
+        HANDLER(RRFreeLease);
     }
 
     return BadRequest;