This rearranges some code, which leads to a slightly faster length-8 pass (I measured up to 10% improvement).
This will create a new commit in order to revert the existing changes.
