More doc-comment fixes.
Merge pull request #1485 from shaver/doc-fixes

More doc-comment fixes