Improved XsdParser.