Incorporate IANA comments.