Fix macro conversion from wiki- to XML-markup