Replacing bit operations macros with bit macro

[josx]

I am replacing multiple instances of bit operation macros in part with a single macro using the preexisting bit(b) macro. This may improve code readability and maintainability.