Progress on TokenUtils.insertSrcSpan