Add unwind-protect clause to with-server macro.