[#1347] Review fixes.