Added more branching to bundle locator in CountIntersections >.<