Reworking XML & RDF modes.