Token normalizer / parser improvements.