Stefan Kangas <stefan@marxist.se> writes:

> I'm not too enthusiastic about option 1, but I've re-attached my patch
> which tries to do 2.  (They are not mutually exclusive.)

Sent it too fast.  I've fixed a typo in the attached patch.