Further tweaks to wiggle hack

I should probably wait until they're done with it, but here's a further
optimized version. Expect more!