Clean up role attrs.
Further corrections in XML.