[#3003] Review fixes.