Fixin' edge cases in the new incremental world.