Changes after Sheng's comments.
Option-guidelines-11 as uploaded to IETF