Improve incremental typing