[#873159] Review fixes.