Fix more code review comments.