Add if.

I also moved the eval-begin code up to where eval was defined.