Update for unboxed closures