Parse more strictly during incremental update
whitespace fixes