Improved cycle handling behavior to give the pathfinder more second chances.