More xml2rfc stuff