rewrite for || to Or, paren fixes