Fixes potential double-free bugs which currently did not occur because
the destructors happened to be called in the right order.