XCOMMONS-457: Improve generic XML syntax