Couldn't you use the `single_argument_lambda_factory` util here?