Fix other instances of accidentally pulling in extra stuff in closures.
Blah