More incremental parsing and extension of some unparsing