Squash some statiz analyzer warnings (#3829)
Squash some more static analyzer warnings (#3829)
Squash even more static analyzer warnings (#3829)
Code formatting (#3829)
Merge pull request #4187 from dschwen/staticanalyzer_3829

Squash static analyzer warnings.