* correct token-count error detection in the iterators