Squash even more static analyzer warnings (#3829)