Fix "'&&' within '||'" warnings on OS X (clang)