[XQueryX] Inconsistency in schema definition

Hello,

I investigated the XML schema definition for XQueryX and came across a
passage that stroke me:

<!-- This is the flwor expression -->
<xsd:complexType name="flworExpr">
  <xsd:complexContent>
    <xsd:extension base="expr">
      <xsd:sequence>
        <xsd:choice maxOccurs="unbounded">
          <xsd:element ref="forClause"/>
          <xsd:element ref="letClause"/>
        </xsd:choice>
        <xsd:element name="whereClause" minOccurs="0"/>
        <xsd:element name="orderByClause" minOccurs="0"/>
        <xsd:element name="returnClause"/>
      </xsd:sequence>
    </xsd:extension>
  </xsd:complexContent>
</xsd:complexType>

Is it intended, that the elements with name "whereClause", "orderByClause"
and "returnClause" have no type information? I rather think, it should be

        <xsd:element ref="whereClause" minOccurs="0"/>
        <xsd:element ref="orderByClause" minOccurs="0"/>
        <xsd:element ref="returnClause"/>

to reference globally defined elements.

By the way: how will those little changes be incorporated into the working
draft?

Regards,
Franz Häuslschmid.