[#871558] Review fixes.