Some minor tweaks.
Changed how we invoke the closure.