Use the new xmlx changes

This change motivated the other one actually...