Replace '||' by 'if'
Add Expr.(Or|And)