[MINOR] Latest comment updates.

All minor tagged options.