convert remaining occurences to hasbit() / setbit() helper macros