Bring in drawTreeEntry routines, and make tree SrcSpans match the
actual GHC SrcSpans by using start of token as marker for end of span