Refactor ::Zip::Entry and ::Zip::ExtraField