More switching to libxml