XMPP: add X-Macros to automated parse tokens