XSD; Improve handling of attributes (incl. collecting them).