Try to mop up failures from previous big reorg

This should fix most of the issues I saw.  Unfortunately this pulls in the bitfield->BitVector rename, which was meant for a bit later, so it might bust some other stuff..  Hopefully not, or not too much though.