Fixing the type issue with the new spans

They key problem was that if T extends TokenSpan, T extends SpanVar[TokenSpan], not SpanVar[T].


While it's possible to work around this by being careful about the this types, I noticed that they were never necessary in the first place, so I removed them altogether.