Cleanup bitset mess.
Add ipv6 scope option

(lying in a local copy)