> I won't be doing those changes though. My sponsor's budget is
> limited, so I'm just having to do the minimum I can get away with.

Pity. Are you available for testing in case someone comes up with a
patch?