Removed a few gratuitous lambdas.