Simplify incremental parser.