Cell unpack optimizations

These changes help with #562 to get back some of the regressions in 2.0.x performance vs 1.4.2.