Fixed loop issues in normal and collapse-optimized.  Time to move on to a function pointer jump table