IncrementalUpdate refactoring and stepping