Fix code review comments.