Fix some "unused variable" warnings.

Is that really necessary? It adds extra code for no apparent benefit.