Refactor checksum buckets into its own type