Minor cleanup: unused variables, KNF.

refs #1514