Properly set cond code after bitwise operations.  Fix some minor code-formatting issues.