Fix error in rescan/invalidation logic for nested notin.
Merge branch 'master' into constraint-strat