Merge pull request #193 from csmith/master

Lambdaise some bits.
Minor tidying.