Made the packing routines a big terser