#7: Minor lambda code generation fixes