Replaces if(x) BUG() with BUG_ON(x)

My apologies, the patch originally posted had some extraneous material. There is a new patch at the same address:
http://web.mit.edu/akhripin/Public/bug_on_patch
-Alex Khripin