Squash some statiz analyzer warnings (#3829)