Commit 512c7356 left a couple of variables unused except for being set.
My compiler didn't whine about this, but some buildfarm members did.