Comment 5 for bug 1760827

> I would mildly oppose doing only a subset of those changes because then we'd be halfway between a crufty design and a clean design, which is even worse than just having 1 design.

Fair enough. I like to help where I can, but I'm afraid the proposed changeset is beyond my expertise.

Meanwhile I wondered whether the original problem cannot be circumvented by using the WITH-DEADLINE macro (which somewhat perplexingly takes a time-periode rather than a point-in-time argument).