Fixing them thar warnins.

Refs #1777.
Merge pull request #2915 from jwpeterson/fixing_warnings

Fixing them thar warnins.
Merge commit '8f8c75898d18e6b5b1b2e441a18ac2cbecd0855f'