More packing/unpacking cleanup work