Update add/remove flows to do better error recovery.