Better job of discarding spurious on_modified events. This should stop all feedback loops now.