Account for the IPv6 ICMP types in the usage. While here account for both singular and plural forms as well.
PR: 284865