3 files changed, 9 insertions, 20 deletions
diff --git a/libxcb/xcb-proto/doc/xml-xcb.txt b/libxcb/xcb-proto/doc/xml-xcb.txt
index f8129ea9c..12c0881a9 100644
--- a/libxcb/xcb-proto/doc/xml-xcb.txt
+++ b/libxcb/xcb-proto/doc/xml-xcb.txt
@@ -218,13 +218,6 @@ enum; the value is restricted to one of the constants named in the enum.
   of the list in terms of other fields in the structure.  See the section
   "Expressions" for details on the expression representation.
 
-<localfield type="identifier" name="identifier" />
-
-  This element represents a parameter in a request that is not sent over the
-  wire.  The field can be referenced in the length expressions of lists or in
-  an exprfield.  The type attribute declares the data type of the field, and
-  the name attribute gives the name of the field.
-
 <exprfield type="identifier" name="identifier">expression</exprfield>
 
   This element represents a field in a request that is calculated rather than
@@ -244,8 +237,8 @@ enum; the value is restricted to one of the constants named in the enum.
   <switch> instead for new protocol definitions.
 
 <switch name="identifier"> switch expression
-    <bitcase> bitcase expression(s), fields </bitcase>
-    <case> case expression(s), fields </case>
+    <bitcase [name="identifier"]> bitcase expression(s), fields </bitcase>
+    <case [name="identifier"]> case expression(s), fields </case>
 </switch>
 
   This element represents conditional inclusion of fields. It can be viewed
diff --git a/libxcb/xcb-proto/src/present.xml b/libxcb/xcb-proto/src/present.xml
index 95fee0181..513388c1c 100644
--- a/libxcb/xcb-proto/src/present.xml
+++ b/libxcb/xcb-proto/src/present.xml
@@ -199,15 +199,7 @@ OF THIS SOFTWARE.
     <field type="CARD64" name="target_msc" />
     <field type="CARD64" name="divisor" />
     <field type="CARD64" name="remainder" />
-    <list type="Notify" name="notifies">
-        <op op="/">
-            <op op="-">
-                <fieldref>length</fieldref>
-                <value>18</value>
-            </op>
-            <value>2</value>
-        </op>
-    </list>
+    <list type="Notify" name="notifies" />
   </event>
 
 </xcb>
diff --git a/libxcb/xcb-proto/src/xprint.xml b/libxcb/xcb-proto/src/xprint.xml
index dc23dd0da..4da49b0a9 100644
--- a/libxcb/xcb-proto/src/xprint.xml
+++ b/libxcb/xcb-proto/src/xprint.xml
@@ -178,9 +178,13 @@ authorization from the authors.
             <fieldref>len_data</fieldref>
         </list>
         <!-- padding -->
-        <list type="STRING8" name="doc_format" />
+        <list type="STRING8" name="doc_format">
+            <fieldref>len_fmt</fieldref>
+        </list>
         <!-- padding -->
-        <list type="STRING8" name="options" />
+        <list type="STRING8" name="options">
+            <fieldref>len_options</fieldref>
+        </list>
     </request>
 
     <request name="PrintGetDocumentData" opcode="12">