So eventually I used only the minimal version of the patch. It looks like
I may have avoided some problems in keeping the patch uptodate by doing
that.
I was very happy to find your version of the patch :) I rarely use Shook's unpacking outside of local initialization, so, it's not a huge loss to stick to your limited version. The docs for Shook's patch on the wiki don't even mention that the patch can be used in the non-local case, though the 5.1 code does support it. My own attempt at a naive 5.2 port failed in ways similar to Xavier's -- my best guess is that some of the new environment handling changes are causing trouble, though I really don't have enough experience with the parser to say that with any confidence.
Thanks again,
Sven