Simplify code paths testing for with-key vs. without-key functions
Implement key / offset capturing for each()