Rebased once again

@cmr: if this is annoying, I can submit it myself.   But your PR has the prime spot 'cause it's so old :-)