More XSD cleanups.