unwarper: fix warps to replaced blocks after merging an expression
unwarper: replace falses array with a set
unwarper: Move expression unwarping into a separate step

Yeee! More steps! More freezes and crazy bugs!
test: Add testcases for new expressions-as-separate-step crashes