Improve expression simplification
Merge if && blocks, bugfix