There are some cases where icmp(add) can be folded into a new icmp. Handle them.