Add column positions to XML AST.
Simplify logic in XML generator.