More cleanups where get_bit_pair should be used instead of