More advances in the XML backend.