WIP: macros are hard
More WIP
upgrades and first results for Scala XML