Done expanded token span without dummy v2