Adapt to new xml2rfc