#438 looks sensible to me.