This resolves the slowdown Bernd Porr noticed, where rather a lot
of useless work got done.   It should apply to 2.4 too.