Build #48884096:   unarchive: simple fixes/cleanups on branch devel almost 2 years ago