Some cleanup for less tolerant XSLT processors.