These are the changes proposed in
 <http://www.ietf.org/mail-archive/web/codec/current/msg03058.html>,
 with some minor additions (see follow-up on the list).