Cleanups of ipv6 changes.

I was late re-reviewing and some comments did not get resolved.