Address comment from PR review.