ENG-6197: Review feedback and other small improvements.