No worries. I got distracted by other matters and anyway didn't have much time for Zsh in the last weeks. If there is anything I can do to help you review the patches, let me know.
My apologies that I haven't worked through this yet. I'm having a
hard time finding a sufficient uninterruptible stretch of time to put
it all together.