Lambdas.
Minor tidying.
Merge pull request #157 from csmith/master

Lambdas.