Done expanded token span without dummy