Fix lots of code since we have lambdas.