Improving tokenization heuristic.