Minor changes before major rework involving bitvectors.