Change the AND and OR operators to use boolean equivalents for easier re...

...placement.