Update doc blocks.

There were a few trailing comments in #3706 that have now been
addressed.