Fixes the code for optional self-delimited packing to make it fit the draft