modernize the bit test macros