Correctly split up strict packing and unpacking for future improvements