ENG-4881 Yet more review changes again (2).