Reverting change to outer most closure, and internal closure (giving up on source map for now)