Add parens to make boolean operators clear TOOLS-41