do not enhandle content of other macros

while doing so reduce copy & paste by looping over
all exclude patterns
Merge remote-tracking branch 'origin/xwiki-544-editor-update' into virtuoso_em