pattern-matching lambdas
remove old expr:lambda code