Replacing more XML markup with restructured text.