Improved wrapped method, removed some explicit Closure usage.