[#1254] Review fixes.