Update for recent bitset version