Improved xml handling for partial highlighting updates.
Fix broken build on jenkins.