Merge the operator comment fixes from trunk.

FossilOrigin-Name: 9f14f55c8ab77e73dbffb7a9c99422bef14cc17a