Following up !941 (merged) , use a script ( $444 ) to rewrite most of XML.

The script was not so clever and skipped several cases that would be hard to implement.