Clean up `Bitv`, `BitvSet`.

This is a huge amount of commits, because I rebased it onto recent master, it'll probably need a force-push.