Fixed up UnbufferedTokenStream mainly, a big set of changes.