Nitpick fixes.
Fix comments on PR.