Lots of changes to get ICMP stuff working lately.