Updates to XMLParser and related classes.