Harmonize the spec and stand-alone versions of the comment header docs.