Fixes build warnings about coupled && and || without parentheses