Add incremental variable grammar support.