Adjusting the infrastructure to later support parameters passed to
sublambdas.