Here is Tom's patch as a text/plain attachment (I can't get to the
patchwork server right now - anybody? - but note that the version on
patchwork is probably line-break damaged).

Nick