[#3028] Review fixes.