Add use of IPV4, IPV6 constants in other places.