The fix builds cleanly and stops the crash described above, for me. I
hadn't hit the bug except by contrivance, so maybe one of the
original discussants can say if I'm missing something.

--
Josh