Remove references to goto out: