Token replacement in TokenIterator
JavaDoc fix