More packaging tinkering.