Process code review comments.
Mostly minor changes.