I agree.
There is a lot of things that are part of the closure, that's why it has been written like that in the first place (and also because the API was not very clear.