Improved code quality.  Refs #6968.