Updated for newer libxml2/libxslt