Code optimisations for localhost:IPv6 #17