Refactor edge-change notifications. Issue #818