Fix a somewhat subtle pair of issues with JumpThreading I introduced in