Adapt to RustXML changes