Simplify some boolean operations.
Merge pull request #5557 from kevingranade/boolyhoo

Simplify some boolean operations.