Reverse bugs introduced by r175

The vomited traceback in plotgen is annoying, but something (ipython?)
was causing the try/finally to behave really unpredictably, and that is
worse.