No more warning in CB bit tests, and calcIndex complete