More work on splitting the token tree when bringing in a SrcSpan