Depends on D83690
LGTM after you fix a couple of nits.
Nit: please end the comment with a period to make this a sentence; I'm not sure if "Options" is really a proper noun; I would have thought "Comment options.".
Might be nice to clean up this comment in a separate NFC commit ahead of time, to match what you do with "Comment Options".
Nit: is moving this option and adding a comment a necessary part of the patch, or is it just a cleanup that could be done before in an NFC commit? If it's possible, I would suggest moving it in a separate commit.
Thanks. Committing this without the NFC change.
That's a fair point, moving the option is not necessary. I will revert the move in this patch and consider creating the // Comment options. section once all comment options get ported to the marshaling system.