(refactor) Use unboxed closures.