Cleanup: use a lambda.