MOAR cleanups.
Merge pull request #9711 from vipulnsward/moar_cleanups

MOAR cleanups of unused variables.