Sorry, commit 08aff5359 was not quite ready and I pushed it too soon.
The purpose of the if block that it removed was to suppress a warn-
ing about an unused variable, but it was a very strange way of accom-
plishing that.
We have a much simpler way that takes only one line and expresses its
intent clearly.