Thanks, I think this is ready to go in.  Could you resend as an
attachment?  It doesn't seem to apply, possibly because of line wrapping
and/or whitespace corruption.