Do a better job of cleaning up after closing a scene.exit=False window