Updated TokenStream to do grouping correctly.