[#875089] Review fixes.