[#866824] Review fixes.