This is that rare case where a Coverity fix makes the code more
obvious and shorter.