Make goto cleanup more consistent There may be some question about whether this is likely to be needed at all, but that's above my head at the moment.