Fix #2: parser with iterator instead tokenstream