committed to trunk (or will when the net starts working again)
a simple-minded patch to fix this issue.  I welcome better
solutions, but for now I just want to plug the leak.