diff --git a/src/xcb.xsd b/src/xcb.xsd
index f84d194..43eb85b 100644
--- a/src/xcb.xsd
+++ b/src/xcb.xsd
@@ -50,22 +50,12 @@ authorization from the authors.
   <xsd:complexType name="var">
     <xsd:attribute name="name" type="xsd:string" use="required" />
     <xsd:attribute name="type" type="xsd:string" use="required" />
+    <xsd:attribute name="enum" type="xsd:string" use="optional" />
+    <xsd:attribute name="mask" type="xsd:string" use="optional" />
   </xsd:complexType>
 
   <!-- field replaces FIELD, PARAM, and REPLY. -->
-  <xsd:element name="field">
-    <xsd:complexType>
-      <xsd:extension base="var">
-	<!-- Used for fields which are bitmasks. Refers to the type which
-	     describes the mask. -->
-	<xsd:attribute name="mask" type="xsd:string" use="optional" />
-
-	<!-- Used for fields which are enums.  Refers to the type which
-	     describes the enumeration. -->
-	<xsd:attribute name="enum" type="xsd:string" use="optional" />
-      </xsd:extension>
-    </xsd:complexType>
-  </xsd:element>
+  <xsd:element name="field" type="var" />
 
   <!-- list replaces ARRAYFIELD, LISTPARAM, and ARRAYREPLY.  The name and type
        are specified as attributes.  The content is an expression giving the