(7zip) Clean up some 7z code