Follow-on to 0312d1b071bd4434ddb3f82888b0323da6bf3732 for #1994.

- Updated function comments to match revisions.
- No functional changes.