Redid support for lambdas.