Remove the ts that was embedded in span_if_current as they are called with ts practically everywhere and that really confuses things
And it probalby slows thigns down a tich too.