Work on Unwind-Protect and Eval-When.