Squash some more static analyzer warnings (#3829)