Make work with new version of xml2rfc