Address further code review comment.