ENG-5714 Add comments in response to review.