Fix comments to match the code.
Merge topic 'minor_cleanup' into next

961c0ba Fix comments to match the code.