Code cleanups, changed _BV() to bit(), no functional change