[#1431] Review fixes.