Minor refactor in xml.h.