Fix some "unused variable" warnings.
Merge pull request #1840 from kacfengine/unused_variable_warnings

Fix some "unused variable" warnings.