XML formatting now takes into account @text annotations