Adding parenthesis around OR'd clauses