[#877393] Review fixes.