[#866926] Review fixes.