More lambda clean-up.