[m-rev.] diff: shortcut some unneeded tests

[Julien Fischer]

On Tue, 18 Aug 2020, Zoltan Somogyi wrote:

> This should not need review.

That's presumably why you didn't attach the diff? ;-)

Julien.