Some cleanup of xslt2 infrastructure