Try to get rid of a lambda...