Simplify parser initializer.
Simplify incremental code.