ENG-4151 Respond to review comments.