Fix more code review comments.

Relates to #4879