Simplify class TokenCollector to avoid two versions of maximal token logic

Simplify class TokenCollector to avoid two versions of maximal token logic #999