M: repairing some tests.
M: XmlParser: refactoring.