[#861816] Review fixes.