More lambda clean-up.
ce