Revert "Wrap for bodies in ifs"

This reverts commit 584b67ebbfcd95d03e040b05369bcfb8ba623099.