I don't think we need this extra anonymous function.  Same comment throughout.