Fixed bug in _redo_crosses that didn't account for prefix/suffix length when assigning cross sets. Added appropriate test case.