Fix some "unused variable" warnings.

Err, ignore that comment. I completely misread your suggestion. It's a good idea, I will change it.