Use the bh bit test/set infrastructure rather than open-coding everything. 
No functional changes.