Refactoring: Push Expr#replaceChild down
Added test
Detect && operator in if statement