Small cleanup
Support newer MultiXml