[#875580] Review fixes.