TokenStream related type fixes.