Rework limit conditions in incremental parser/typer to work with final result