You shouldn't need the inner closure. I think I've gotten rid of all of the context issues, I just haven't gotten around to removing the other closures.