Address Duff 2nd round comments

(note that v2 xml2rfc mangles the ISO references)