Use and EndToken marker instead of StopIteration