> It seems to me that if this fixes the issue, that the next similar one > is already lurking in the shadows waiting to jump out on us.
Yes, this is true that there may be other cases, but I am not sure if it's worth carrying all the extra bytes in the jumble to deal with a few cases like this. This is why I don't think Variant B or tracking the offset is a thrilling idea. -1 for me. -- Sami
