Corinna Vinschen writes:
> Sorry if that's a lot.  It just occured to me while reading your code.
> I'm not adamant about the structural change I outlined above, but to
> me it seems better to do it that way.  What do you think?

I've implemented your suggestions except the struct stuff.  I've not as
thoroughly tested it as last time, though.