ENG-5359 Respond to review comments.