To make it more concrete, here's a suggested patch.
Comments?  Objections?


        Stefan