Reorganize how values are stored in h->non_zero_count.