diff --git a/src/libcode/vx_stat_out/stat_columns.cc b/src/libcode/vx_stat_out/stat_columns.cc
index e5ce2f5f6e..f78db442c0 100644
--- a/src/libcode/vx_stat_out/stat_columns.cc
+++ b/src/libcode/vx_stat_out/stat_columns.cc
@@ -101,19 +101,19 @@ ConcatString append_climo_bin(const ConcatString &mask_name,
 
 void write_header_row(const char * const * cols, int n_cols, int hdr_flag,
                       AsciiTable &at, int r, int c) {
-   int i;
 
    // Write the header column names if requested
    if(hdr_flag) {
-      for(i=0; i<n_header_columns; i++)
+      for(int i=0; i<n_header_columns; i++)
          at.set_entry(r, i+c, (string)hdr_columns[i]);
 
       c += n_header_columns;
    }
 
    // Write the columns names specific to this line type
-   for(i=0; i<n_cols; i++)
+   for(int i=0; i<n_cols; i++) {
      at.set_entry(r, i+c, (string)cols[i]);
+   }
 
    return;
 }
@@ -162,13 +162,14 @@ void write_pct_header_row(int hdr_flag, int n_thresh, AsciiTable &at,
 
 void write_pstd_header_row(int hdr_flag, int n_thresh, AsciiTable &at,
                            int r, int c) {
-   int i, col;
+   int col;
    char tmp_str[max_str_len];
 
    // Write the header column names if requested
    if(hdr_flag) {
-      for(i=0; i<n_header_columns; i++)
+      for(int i=0; i<n_header_columns; i++) {
          at.set_entry(r, i+c, (string)hdr_columns[i]);
+      }
 
       c += n_header_columns;
    }
@@ -193,7 +194,7 @@ void write_pstd_header_row(int hdr_flag, int n_thresh, AsciiTable &at,
    at.set_entry(r, c+16, (string)pstd_columns[16]);
 
    // Write THRESH_i for each threshold
-   for(i=0, col=c+17; i<n_thresh; i++) {
+   for(int i=0, col=c+17; i<n_thresh; i++) {
 
       snprintf(tmp_str, sizeof(tmp_str), "%s%i", pstd_columns[17], i+1);
       at.set_entry(r, col, (string)tmp_str); // Threshold
@@ -207,13 +208,14 @@ void write_pstd_header_row(int hdr_flag, int n_thresh, AsciiTable &at,
 
 void write_pjc_header_row(int hdr_flag, int n_thresh, AsciiTable &at,
                           int r, int c) {
-   int i, col;
+   int col;
    char tmp_str[max_str_len];
 
    // Write the header column names if requested
    if(hdr_flag) {
-      for(i=0; i<n_header_columns; i++)
+      for(int i=0; i<n_header_columns; i++) {
          at.set_entry(r, i+c, (string)hdr_columns[i]);
+      }
 
       c += n_header_columns;
    }
@@ -224,7 +226,7 @@ void write_pjc_header_row(int hdr_flag, int n_thresh, AsciiTable &at,
 
    // Write THRESH_i, OY_TP_i, ON_TP_i, CALIBRATION_i, REFINEMENT_i,
    // LIKELIHOOD_i, and BASER_i for each row of the Nx2 table
-   for(i=0, col=c+2; i<n_thresh-1; i++) {
+   for(int i=0, col=c+2; i<n_thresh-1; i++) {
 
       snprintf(tmp_str, sizeof(tmp_str), "%s%i", pjc_columns[2], i+1);
       at.set_entry(r, col, (string)tmp_str); // Threshold
@@ -268,13 +270,14 @@ void write_pjc_header_row(int hdr_flag, int n_thresh, AsciiTable &at,
 
 void write_prc_header_row(int hdr_flag, int n_thresh, AsciiTable &at,
                           int r, int c) {
-   int i, col;
+   int col;
    char tmp_str[max_str_len];
 
    // Write the header column names if requested
    if(hdr_flag) {
-      for(i=0; i<n_header_columns; i++)
+      for(int i=0; i<n_header_columns; i++) {
          at.set_entry(r, i+c, (string)hdr_columns[i]);
+      }
 
       c += n_header_columns;
    }
@@ -284,7 +287,7 @@ void write_prc_header_row(int hdr_flag, int n_thresh, AsciiTable &at,
    at.set_entry(r, c+1, (string)prc_columns[1]);
 
    // Write THRESH_i, PODY_i, POFD_i for each row of the Nx2 table
-   for(i=0, col=c+2; i<n_thresh-1; i++) {
+   for(int i=0, col=c+2; i<n_thresh-1; i++) {
 
       snprintf(tmp_str, sizeof(tmp_str), "%s%i", prc_columns[2], i+1);
       at.set_entry(r, col, (string)tmp_str); // Threshold
@@ -312,13 +315,14 @@ void write_prc_header_row(int hdr_flag, int n_thresh, AsciiTable &at,
 
 void write_eclv_header_row(int hdr_flag, int n_pnt, AsciiTable &at,
                            int r, int c) {
-   int i, col;
+   int col;
    ConcatString tmp_str;
 
    // Write the header column names if requested
    if(hdr_flag) {
-      for(i=0; i<n_header_columns; i++)
+      for(int i=0; i<n_header_columns; i++) {
          at.set_entry(r, i+c, (string)hdr_columns[i]);
+      }
 
       c += n_header_columns;
    }
@@ -330,7 +334,7 @@ void write_eclv_header_row(int hdr_flag, int n_pnt, AsciiTable &at,
    at.set_entry(r, c+3, (string)eclv_columns[3]);
 
    // Write CL_i and VALUE_i for each bin
-   for(i=0, col=c+4; i<n_pnt; i++) {
+   for(int i=0, col=c+4; i<n_pnt; i++) {
 
       tmp_str.format("%s%i", eclv_columns[4], i+1);
       at.set_entry(r, col, tmp_str);
@@ -348,13 +352,14 @@ void write_eclv_header_row(int hdr_flag, int n_pnt, AsciiTable &at,
 
 void write_rhist_header_row(int hdr_flag, int n_rank, AsciiTable &at,
                             int r, int c) {
-   int i, col;
+   int col;
    char tmp_str[max_str_len];
 
    // Write the header column names if requested
    if(hdr_flag) {
-      for(i=0; i<n_header_columns; i++)
+      for(int i=0; i<n_header_columns; i++) {
          at.set_entry(r, i+c, (string)hdr_columns[i]);
+      } 
 
       c += n_header_columns;
    }
@@ -364,7 +369,7 @@ void write_rhist_header_row(int hdr_flag, int n_rank, AsciiTable &at,
    at.set_entry(r, c+1, (string)rhist_columns[1]);
 
    // Write RANK_i for each rank
-   for(i=0, col=c+2; i<n_rank; i++) {
+   for(int i=0, col=c+2; i<n_rank; i++) {
 
       snprintf(tmp_str, sizeof(tmp_str), "%s%i", rhist_columns[2], i+1);
       at.set_entry(r, col, (string)tmp_str); // Counts for each rank
@@ -378,13 +383,14 @@ void write_rhist_header_row(int hdr_flag, int n_rank, AsciiTable &at,
 
 void write_phist_header_row(int hdr_flag, int n_bin, AsciiTable &at,
                             int r, int c) {
-   int i, col;
+   int col;
    char tmp_str[max_str_len];
 
    // Write the header column names if requested
    if(hdr_flag) {
-      for(i=0; i<n_header_columns; i++)
+      for(int i=0; i<n_header_columns; i++) {
          at.set_entry(r, i+c, (string)hdr_columns[i]);
+      }
 
       c += n_header_columns;
    }
@@ -395,7 +401,7 @@ void write_phist_header_row(int hdr_flag, int n_bin, AsciiTable &at,
    at.set_entry(r, c+2, (string)phist_columns[2]);
 
    // Write BIN_i for each bin
-   for(i=0, col=c+3; i<n_bin; i++) {
+   for(int i=0, col=c+3; i<n_bin; i++) {
 
       snprintf(tmp_str, sizeof(tmp_str), "%s%i", phist_columns[3], i+1);
       at.set_entry(r, col, (string)tmp_str); // Counts for each bin
@@ -409,13 +415,14 @@ void write_phist_header_row(int hdr_flag, int n_bin, AsciiTable &at,
 
 void write_orank_header_row(int hdr_flag, int n_ens, AsciiTable &at,
                             int r, int c) {
-   int i, col;
+   int col;
    char tmp_str[max_str_len];
 
    // Write the header column names if requested
    if(hdr_flag) {
-      for(i=0; i<n_header_columns; i++)
+      for(int i=0; i<n_header_columns; i++) {
          at.set_entry(r, i+c, (string)hdr_columns[i]);
+      }
 
       c += n_header_columns;
    }
@@ -435,7 +442,7 @@ void write_orank_header_row(int hdr_flag, int n_ens, AsciiTable &at,
    at.set_entry(r, c+11, (string)orank_columns[11]);
 
    // Write ENS_i for each ensemble member
-   for(i=0, col=c+12; i<n_ens; i++) {
+   for(int i=0, col=c+12; i<n_ens; i++) {
 
      snprintf(tmp_str, sizeof(tmp_str), "%s%i", orank_columns[12], i+1);
       at.set_entry(r, col, (string)tmp_str); // Ensemble member value
@@ -460,13 +467,14 @@ void write_orank_header_row(int hdr_flag, int n_ens, AsciiTable &at,
 
 void write_relp_header_row(int hdr_flag, int n_ens, AsciiTable &at,
                            int r, int c) {
-   int i, col;
+   int col;
    char tmp_str[max_str_len];
 
    // Write the header column names if requested
    if(hdr_flag) {
-      for(i=0; i<n_header_columns; i++)
+      for(int i=0; i<n_header_columns; i++) {
          at.set_entry(r, i+c, (string)hdr_columns[i]);
+      } 
 
       c += n_header_columns;
    }
@@ -476,7 +484,7 @@ void write_relp_header_row(int hdr_flag, int n_ens, AsciiTable &at,
    at.set_entry(r, c+1, (string)relp_columns[1]);
 
    // Write RELP_i for each ensemble member
-   for(i=0, col=c+2; i<n_ens; i++) {
+   for(int i=0, col=c+2; i<n_ens; i++) {
      snprintf(tmp_str, sizeof(tmp_str), "%s%i", relp_columns[2], i+1);
       at.set_entry(r, col, (string)tmp_str);
       col++;
@@ -629,7 +637,6 @@ void write_cts_row(StatHdrColumns &shc, const CTSInfo &cts_info,
                    STATOutputType out_type,
                    AsciiTable &stat_at, int &stat_row,
                    AsciiTable &txt_at, int &txt_row) {
-   int i;
 
    // CTS line type
    shc.set_line_type(stat_cts_str);
@@ -643,7 +650,7 @@ void write_cts_row(StatHdrColumns &shc, const CTSInfo &cts_info,
    shc.set_cov_thresh(na_str);
 
    // Write a line for each alpha value
-   for(i=0; i<cts_info.n_alpha; i++) {
+   for(int i=0; i<cts_info.n_alpha; i++) {
 
       // Alpha value
       shc.set_alpha(cts_info.alpha[i]);
@@ -714,7 +721,6 @@ void write_mcts_row(StatHdrColumns &shc, const MCTSInfo &mcts_info,
                     STATOutputType out_type,
                     AsciiTable &stat_at, int &stat_row,
                     AsciiTable &txt_at, int &txt_row) {
-   int i;
 
    // MCTS line type
    shc.set_line_type(stat_mcts_str);
@@ -728,7 +734,7 @@ void write_mcts_row(StatHdrColumns &shc, const MCTSInfo &mcts_info,
    shc.set_cov_thresh(na_str);
 
    // Write a line for each alpha value
-   for(i=0; i<mcts_info.n_alpha; i++) {
+   for(int i=0; i<mcts_info.n_alpha; i++) {
 
       // Alpha value
       shc.set_alpha(mcts_info.alpha[i]);
@@ -760,7 +766,6 @@ void write_cnt_row(StatHdrColumns &shc, const CNTInfo &cnt_info,
                    STATOutputType out_type, int i_bin, int n_bin,
                    AsciiTable &stat_at, int &stat_row,
                    AsciiTable &txt_at, int &txt_row) {
-   int i;
    ConcatString mask_name = shc.get_mask();
 
    // CNT line type
@@ -779,7 +784,7 @@ void write_cnt_row(StatHdrColumns &shc, const CNTInfo &cnt_info,
    shc.set_mask(cs.c_str());
 
    // Write a line for each alpha value
-   for(i=0; i<cnt_info.n_alpha; i++) {
+   for(int i=0; i<cnt_info.n_alpha; i++) {
 
       // Alpha value
       shc.set_alpha(cnt_info.alpha[i]);
@@ -986,7 +991,6 @@ void write_vcnt_row(StatHdrColumns &shc, const VL1L2Info &vcnt_info,
                      STATOutputType out_type,
                      AsciiTable &stat_at, int &stat_row,
                      AsciiTable &txt_at, int &txt_row) {
-   int i;
 
    // VL1L2 line type
    shc.set_line_type(stat_vcnt_str);
@@ -1000,7 +1004,7 @@ void write_vcnt_row(StatHdrColumns &shc, const VL1L2Info &vcnt_info,
    shc.set_cov_thresh(na_str);
 
    // Write a line for each alpha value
-   for(i=0; i<vcnt_info.n_alpha; i++) {
+   for(int i=0; i<vcnt_info.n_alpha; i++) {
 
       // Alpha value
       shc.set_alpha(vcnt_info.alpha[i]);
@@ -1084,7 +1088,6 @@ void write_pstd_row(StatHdrColumns &shc, const PCTInfo &pct_info,
                     AsciiTable &stat_at, int &stat_row,
                     AsciiTable &txt_at, int &txt_row,
                     bool update_thresh) {
-   int i;
    ConcatString mask_name = shc.get_mask();
 
    // PSTD line type
@@ -1103,7 +1106,7 @@ void write_pstd_row(StatHdrColumns &shc, const PCTInfo &pct_info,
    shc.set_mask(cs.c_str());
 
    // Write a line for each alpha value
-   for(i=0; i<pct_info.n_alpha; i++) {
+   for(int i=0; i<pct_info.n_alpha; i++) {
 
       // Alpha value
       shc.set_alpha(pct_info.alpha[i]);
@@ -1239,7 +1242,6 @@ void write_eclv_row(StatHdrColumns &shc, const PCTInfo &pct_info,
                     STATOutputType out_type, int i_bin, int n_bin,
                     AsciiTable &stat_at, int &stat_row,
                     AsciiTable &txt_at, int &txt_row) {
-   int i;
    ConcatString mask_name = shc.get_mask();
 
    // ECLV line type
@@ -1258,7 +1260,7 @@ void write_eclv_row(StatHdrColumns &shc, const PCTInfo &pct_info,
    shc.set_mask(cs.c_str());
 
    // Write ECLV line for each PCT row
-   for(i=0; i<pct_info.pct.nrows(); i++) {
+   for(int i=0; i<pct_info.pct.nrows(); i++) {
 
       // Update the forecast threshold
       shc.set_fcst_thresh(pct_info.fthresh[i+1]);
@@ -1376,7 +1378,6 @@ void write_nbrcts_row(StatHdrColumns &shc, const NBRCTSInfo &nbrcts_info,
                       STATOutputType out_type,
                       AsciiTable &stat_at, int &stat_row,
                       AsciiTable &txt_at, int &txt_row) {
-   int i;
 
    // NBRCTS line type
    shc.set_line_type(stat_nbrcts_str);
@@ -1392,7 +1393,7 @@ void write_nbrcts_row(StatHdrColumns &shc, const NBRCTSInfo &nbrcts_info,
    shc.set_thresh_logic(SetLogic::None);
 
    // Write a line for each alpha value
-   for(i=0; i<nbrcts_info.cts_info.n_alpha; i++) {
+   for(int i=0; i<nbrcts_info.cts_info.n_alpha; i++) {
 
       // Alpha value
       shc.set_alpha(nbrcts_info.cts_info.alpha[i]);
@@ -1425,7 +1426,6 @@ void write_nbrcnt_row(StatHdrColumns &shc, const NBRCNTInfo &nbrcnt_info,
                       STATOutputType out_type,
                       AsciiTable &stat_at, int &stat_row,
                       AsciiTable &txt_at, int &txt_row) {
-   int i;
 
    // NBRCNT line type
    shc.set_line_type(stat_nbrcnt_str);
@@ -1439,7 +1439,7 @@ void write_nbrcnt_row(StatHdrColumns &shc, const NBRCNTInfo &nbrcnt_info,
    shc.set_cov_thresh(na_str);
 
    // Write a line for each alpha value
-   for(i=0; i<nbrcnt_info.n_alpha; i++) {
+   for(int i=0; i<nbrcnt_info.n_alpha; i++) {
 
       // Alpha value
       shc.set_alpha(nbrcnt_info.alpha[i]);
@@ -1549,7 +1549,6 @@ void write_mpr_row(StatHdrColumns &shc, const PairDataPoint *pd_ptr,
                    AsciiTable &stat_at, int &stat_row,
                    AsciiTable &txt_at, int &txt_row,
                    bool update_thresh) {
-   int i;
 
    // MPR line type
    shc.set_line_type(stat_mpr_str);
@@ -1566,7 +1565,7 @@ void write_mpr_row(StatHdrColumns &shc, const PairDataPoint *pd_ptr,
    shc.set_alpha(bad_data_double);
 
    // Write a line for each matched pair
-   for(i=0; i<pd_ptr->n_obs; i++) {
+   for(int i=0; i<pd_ptr->n_obs; i++) {
 
       // Set the observation valid time
       shc.set_obs_valid_beg(pd_ptr->vld_ta[i]);
@@ -1700,7 +1699,6 @@ void write_isc_row(StatHdrColumns &shc, const ISCInfo &isc_info,
                    STATOutputType out_type,
                    AsciiTable &stat_at, int &stat_row,
                    AsciiTable &txt_at, int &txt_row) {
-   int i;
 
    // ISC line type
    shc.set_line_type(stat_isc_str);
@@ -1714,7 +1712,7 @@ void write_isc_row(StatHdrColumns &shc, const ISCInfo &isc_info,
 
    // Write a line for each scale plus one for the thresholded binary
    // field and one for the father wavelet
-   for(i=-1; i<=isc_info.n_scale; i++) {
+   for(int i=-1; i<=isc_info.n_scale; i++) {
 
       // Write the header columns
       write_header_cols(shc, stat_at, stat_row);
@@ -1902,7 +1900,6 @@ void write_orank_row(StatHdrColumns &shc, const PairDataEnsemble *pd_ptr,
                      STATOutputType out_type,
                      AsciiTable &stat_at, int &stat_row,
                      AsciiTable &txt_at, int &txt_row) {
-   int i;
 
    // Observation Rank line type
    shc.set_line_type(stat_orank_str);
@@ -1914,7 +1911,7 @@ void write_orank_row(StatHdrColumns &shc, const PairDataEnsemble *pd_ptr,
    shc.set_alpha(bad_data_double);
 
    // Write a line for each ensemble pair
-   for(i=0; i<pd_ptr->n_obs; i++) {
+   for(int i=0; i<pd_ptr->n_obs; i++) {
 
       // Set the observation valid time
       shc.set_obs_valid_beg(pd_ptr->vld_ta[i]);
@@ -1947,7 +1944,6 @@ void write_ssvar_row(StatHdrColumns &shc, const PairDataEnsemble *pd_ptr,
                      double alpha, STATOutputType out_type,
                      AsciiTable &stat_at, int &stat_row,
                      AsciiTable &txt_at, int &txt_row) {
-   int i;
 
    // SSVAR line type
    shc.set_line_type(stat_ssvar_str);
@@ -1961,7 +1957,7 @@ void write_ssvar_row(StatHdrColumns &shc, const PairDataEnsemble *pd_ptr,
    shc.set_alpha(alpha);
 
    // Write a line for each ssvar bin
-   for(i=0; i<pd_ptr->ssvar_bins[0].n_bin; i++) {
+   for(int i=0; i<pd_ptr->ssvar_bins[0].n_bin; i++) {
 
       // Write the header columns
       write_header_cols(shc, stat_at, stat_row);
@@ -2805,7 +2801,7 @@ void write_cnt_cols(const CNTInfo &cnt_info, int i,
 
 void write_mctc_cols(const MCTSInfo &mcts_info,
                      AsciiTable &at, int r, int c) {
-   int i, j, col;
+   int col;
 
    //
    // Multi-Category Contingency Table Counts
@@ -2821,8 +2817,8 @@ void write_mctc_cols(const MCTSInfo &mcts_info,
    //
    // Loop through the contingency table rows and columns
    //
-   for(i=0, col=c+2; i<mcts_info.cts.nrows(); i++) {
-      for(j=0; j<mcts_info.cts.ncols(); j++) {
+   for(int i=0, col=c+2; i<mcts_info.cts.nrows(); i++) {
+      for(int j=0; j<mcts_info.cts.ncols(); j++) {
 
          at.set_entry(r, col,      // Fi_Oj table counts
             mcts_info.cts.entry(i, j));
@@ -3258,7 +3254,7 @@ void write_vcnt_cols(const VL1L2Info &vcnt_info, int i,
 
 void write_pct_cols(const PCTInfo &pct_info,
                     AsciiTable &at, int r, int c) {
-   int i, col;
+   int col;
 
    //
    // Nx2 Contingency Table Counts for Probability Forecast
@@ -3276,7 +3272,7 @@ void write_pct_cols(const PCTInfo &pct_info,
    //
    // Write THRESH_i, OY_i, ON_i for each row of the Nx2 table
    //
-   for(i=0, col=c+2; i<pct_info.pct.nrows(); i++) {
+   for(int i=0, col=c+2; i<pct_info.pct.nrows(); i++) {
 
       at.set_entry(r, col, // THRESH
          pct_info.pct.threshold(i));
@@ -3370,7 +3366,7 @@ void write_pstd_cols(const PCTInfo &pct_info, int alpha_i,
    //
    // Write THRESH_i for each probability threshold
    //
-   for(i=0, col=c+17; i<=pct_info.pct.nrows(); i++) {
+   for(int i=0, col=c+17; i<=pct_info.pct.nrows(); i++) {
 
       at.set_entry(r, col, // THRESH
          pct_info.pct.threshold(i));
@@ -3384,7 +3380,7 @@ void write_pstd_cols(const PCTInfo &pct_info, int alpha_i,
 
 void write_pjc_cols(const PCTInfo &pct_info,
                     AsciiTable &at, int r, int c) {
-   int i, col;
+   int col;
 
    //
    // Nx2 Contingency Table Joint/Continuous Probability
@@ -3405,7 +3401,7 @@ void write_pjc_cols(const PCTInfo &pct_info,
    // Write THRESH, OY, ON for each row of the Nx2 table
    //
    double total = pct_info.pct.total();
-   for(i=0, col=c+2; i<pct_info.pct.nrows(); i++) {
+   for(int i=0, col=c+2; i<pct_info.pct.nrows(); i++) {
 
       at.set_entry(r, col, // THRESH
          pct_info.pct.threshold(i));
@@ -3451,7 +3447,7 @@ void write_pjc_cols(const PCTInfo &pct_info,
 
 void write_prc_cols(const PCTInfo &pct_info,
                     AsciiTable &at, int r, int c) {
-   int i, col;
+   int col;
    TTContingencyTable ct;
 
    //
@@ -3470,7 +3466,7 @@ void write_prc_cols(const PCTInfo &pct_info,
    //
    // Write THRESH, PODY, POFD for each row of the Nx2 table
    //
-   for(i=0, col=c+2; i<pct_info.pct.nrows(); i++) {
+   for(int i=0, col=c+2; i<pct_info.pct.nrows(); i++) {
 
       //
       // Get the 2x2 contingency table for this row
@@ -3527,7 +3523,7 @@ void write_eclv_cols(const TTContingencyTable &ct,
    //
    // Write CL_i and VALUE_i count for each bin
    //
-   for(i=0, col=c+4; i<eclv_points.n_elements(); i++) {
+   for(int i=0, col=c+4; i<eclv_points.n_elements(); i++) {
 
       at.set_entry(r, col, // CL_i
          eclv_points[i]);
@@ -4450,7 +4446,7 @@ void write_rps_cols(const RPSInfo &rps_info,
 
 void write_rhist_cols(const PairDataEnsemble *pd_ptr,
                       AsciiTable &at, int r, int c) {
-   int i, col;
+   int col;
 
    //
    // Ensemble Ranked Histogram
@@ -4467,7 +4463,7 @@ void write_rhist_cols(const PairDataEnsemble *pd_ptr,
    //
    // Write RANK_i count for each bin
    //
-   for(i=0, col=c+2; i<pd_ptr->rhist_na.n_elements(); i++) {
+   for(int i=0, col=c+2; i<pd_ptr->rhist_na.n_elements(); i++) {
 
       at.set_entry(r, col, // RANK_i
          nint(pd_ptr->rhist_na[i]));
@@ -4481,7 +4477,7 @@ void write_rhist_cols(const PairDataEnsemble *pd_ptr,
 
 void write_phist_cols(const PairDataEnsemble *pd_ptr,
                       AsciiTable &at, int r, int c) {
-   int i, col;
+   int col;
 
    //
    // Probability Integral Transform Histogram
@@ -4500,7 +4496,7 @@ void write_phist_cols(const PairDataEnsemble *pd_ptr,
    //
    // Write BIN_i count for each bin
    //
-   for(i=0, col=c+3; i<pd_ptr->phist_na.n_elements(); i++) {
+   for(int i=0, col=c+3; i<pd_ptr->phist_na.n_elements(); i++) {
 
       at.set_entry(r, col, // BIN_i
          nint(pd_ptr->phist_na[i]));
@@ -4514,7 +4510,7 @@ void write_phist_cols(const PairDataEnsemble *pd_ptr,
 
 void write_orank_cols(const PairDataEnsemble *pd_ptr, int i,
                       AsciiTable &at, int r, int c) {
-   int j, col;
+   int col;
 
    //
    // Ensemble Observation Rank Matched Pairs
@@ -4568,7 +4564,7 @@ void write_orank_cols(const PairDataEnsemble *pd_ptr, int i,
    //
    // Write ENS_j for each ensemble member
    //
-   for(j=0, col=c+12; j<pd_ptr->n_ens; j++) {
+   for(int j=0, col=c+12; j<pd_ptr->n_ens; j++) {
 
       at.set_entry(r, col, // ENS_j
          pd_ptr->e_na[j][i]);
@@ -4762,7 +4758,7 @@ void write_ssvar_cols(const PairDataEnsemble *pd_ptr, int i,
 
 void write_relp_cols(const PairDataEnsemble *pd_ptr,
                      AsciiTable &at, int r, int c) {
-   int i, col;
+   int col;
 
    //
    // Relative Position
@@ -4778,7 +4774,7 @@ void write_relp_cols(const PairDataEnsemble *pd_ptr,
    //
    // Write RELP_i count for each bin
    //
-   for(i=0, col=c+2; i<pd_ptr->relp_na.n_elements(); i++) {
+   for(int i=0, col=c+2; i<pd_ptr->relp_na.n_elements(); i++) {
 
       at.set_entry(r, col, // RELP_i
          pd_ptr->relp_na[i]);
diff --git a/src/libcode/vx_statistics/compute_ci.cc b/src/libcode/vx_statistics/compute_ci.cc
index 8296cc5d76..3633d61acb 100644
--- a/src/libcode/vx_statistics/compute_ci.cc
+++ b/src/libcode/vx_statistics/compute_ci.cc
@@ -61,14 +61,14 @@ void compute_normal_ci(double v, double alpha, double se,
 //
 ////////////////////////////////////////////////////////////////////////
 
-void compute_proportion_ci(double p, int n, double alpha, double vif,
+void compute_proportion_ci(double p, int n_pairs, double alpha, double vif,
                            double &p_cl, double &p_cu) {
 
    //
    // Compute the confidence interval using the Wilson method for all
    // sizes of n, since it provides a better approximation
    //
-   compute_wilson_ci(p, n, alpha, vif, p_cl, p_cu);
+   compute_wilson_ci(p, n_pairs, alpha, vif, p_cl, p_cu);
 
    return;
 }
@@ -81,7 +81,7 @@ void compute_proportion_ci(double p, int n, double alpha, double vif,
 //
 ////////////////////////////////////////////////////////////////////////
 
-void compute_wald_ci(double p, int n, double alpha, double vif,
+void compute_wald_ci(double p, int n_pairs, double alpha, double vif,
                      double &p_cl, double &p_cu) {
    double v, cv_normal_l, cv_normal_u;
 
@@ -100,7 +100,7 @@ void compute_wald_ci(double p, int n, double alpha, double vif,
    //
    // Compute the upper and lower bounds of the confidence interval
    //
-   v = vif*p*(1.0-p)/n;
+   v = vif*p*(1.0-p)/n_pairs;
 
    if(v < 0.0) {
       p_cl = bad_data_double;
@@ -122,10 +122,10 @@ void compute_wald_ci(double p, int n, double alpha, double vif,
 //
 ////////////////////////////////////////////////////////////////////////
 
-void compute_wilson_ci(double p, int n_int, double alpha, double vif,
+void compute_wilson_ci(double p, int n_pairs, double alpha, double vif,
                        double &p_cl, double &p_cu) {
    double v, cv_normal_l, cv_normal_u;
-   long long n = n_int;
+   long long n = n_pairs;
 
    if(is_bad_data(p)) {
       p_cl = p_cu = bad_data_double;
diff --git a/src/libcode/vx_statistics/compute_ci.h b/src/libcode/vx_statistics/compute_ci.h
index ddaf68d36a..5617ced8f3 100644
--- a/src/libcode/vx_statistics/compute_ci.h
+++ b/src/libcode/vx_statistics/compute_ci.h
@@ -28,13 +28,13 @@ static const int wald_sample_threshold  = 100;
 extern void compute_normal_ci(double x, double alpha, double se,
    double &cl, double &cu);
 
-extern void compute_proportion_ci(double p, int n, double alpha,
+extern void compute_proportion_ci(double p, int n_pairs, double alpha,
    double vif, double &p_cl, double &p_cu);
 
-extern void compute_wald_ci(double p, int n, double alpha,
+extern void compute_wald_ci(double p, int n_pairs, double alpha,
    double vif, double &p_cl, double &p_cu);
 
-extern void compute_wilson_ci(double p, int n, double alpha,
+extern void compute_wilson_ci(double p, int n_pairs, double alpha,
    double vif, double &p_cl, double &p_cu);
 
 extern void compute_woolf_ci(double odds, double alpha,
diff --git a/src/libcode/vx_statistics/contable.h b/src/libcode/vx_statistics/contable.h
index bce3ad20fc..27e054c73a 100644
--- a/src/libcode/vx_statistics/contable.h
+++ b/src/libcode/vx_statistics/contable.h
@@ -31,7 +31,10 @@ class TTContingencyTable;
 
 class ContingencyTable {
 
-   protected:
+   friend class TTContingencyTable;
+   friend class Nx2ContingencyTable;
+
+   private:
 
       void init_from_scratch();
 
diff --git a/src/libcode/vx_statistics/contable_stats.cc b/src/libcode/vx_statistics/contable_stats.cc
index 5fca124ad2..9cf18107d3 100644
--- a/src/libcode/vx_statistics/contable_stats.cc
+++ b/src/libcode/vx_statistics/contable_stats.cc
@@ -41,7 +41,7 @@ double TTContingencyTable::baser_ci(double alpha,
 
    v = baser();
 
-   compute_proportion_ci(v, total(), alpha, 1.0, cl, cu);
+   compute_proportion_ci(v, Npairs, alpha, 1.0, cl, cu);
 
    return v;
 }
@@ -60,7 +60,7 @@ double TTContingencyTable::fmean_ci(double alpha,
 
    v = fmean();
 
-   compute_proportion_ci(v, total(), alpha, 1.0, cl, cu);
+   compute_proportion_ci(v, Npairs, alpha, 1.0, cl, cu);
 
    return v;
 }
@@ -79,7 +79,7 @@ double TTContingencyTable::accuracy_ci(double alpha,
 
    v = accuracy();
 
-   compute_proportion_ci(v, total(), alpha, 1.0, cl, cu);
+   compute_proportion_ci(v, Npairs, alpha, 1.0, cl, cu);
 
    return v;
 }
@@ -112,7 +112,7 @@ double TTContingencyTable::pod_yes_ci(double alpha,
 
    v = pod_yes();
 
-   compute_proportion_ci(v, total(), alpha, 1.0, cl, cu);
+   compute_proportion_ci(v, Npairs, alpha, 1.0, cl, cu);
 
    return v;
 }
@@ -131,7 +131,7 @@ double TTContingencyTable::pod_no_ci(double alpha,
 
    v = pod_no();
 
-   compute_proportion_ci(v, total(), alpha, 1.0, cl, cu);
+   compute_proportion_ci(v, Npairs, alpha, 1.0, cl, cu);
 
    return v;
 }
@@ -157,7 +157,7 @@ double TTContingencyTable::pofd_ci(double alpha,
 
    v = pofd();
 
-   compute_proportion_ci(v, total(), alpha, 1.0, cl, cu);
+   compute_proportion_ci(v, Npairs, alpha, 1.0, cl, cu);
 
    return v;
 }
@@ -180,7 +180,7 @@ double TTContingencyTable::far_ci(double alpha,
 
    v = far();
 
-   compute_proportion_ci(v, total(), alpha, 1.0, cl, cu);
+   compute_proportion_ci(v, Npairs, alpha, 1.0, cl, cu);
 
    return v;
 }
@@ -203,7 +203,7 @@ double TTContingencyTable::csi_ci(double alpha,
 
    v = csi();
 
-   compute_proportion_ci(v, total(), alpha, 1.0, cl, cu);
+   compute_proportion_ci(v, Npairs, alpha, 1.0, cl, cu);
 
    return v;
 }
diff --git a/src/libcode/vx_statistics/met_stats.cc b/src/libcode/vx_statistics/met_stats.cc
index f40827f606..c1e88d28de 100644
--- a/src/libcode/vx_statistics/met_stats.cc
+++ b/src/libcode/vx_statistics/met_stats.cc
@@ -380,21 +380,21 @@ void CTSInfo::compute_ci() {
       // Compute confidence intervals for the scores based on
       // proportions
       //
-      compute_proportion_ci(baser.v, cts.total(), alpha[i], baser.vif,
+      compute_proportion_ci(baser.v, cts.n_pairs(), alpha[i], baser.vif,
                             baser.v_ncl[i], baser.v_ncu[i]);
-      compute_proportion_ci(fmean.v, cts.total(), alpha[i], fmean.vif,
+      compute_proportion_ci(fmean.v, cts.n_pairs(), alpha[i], fmean.vif,
                             fmean.v_ncl[i], fmean.v_ncu[i]);
-      compute_proportion_ci(acc.v, cts.total(), alpha[i], acc.vif,
+      compute_proportion_ci(acc.v, cts.n_pairs(), alpha[i], acc.vif,
                             acc.v_ncl[i], acc.v_ncu[i]);
-      compute_proportion_ci(pody.v, cts.total(), alpha[i], pody.vif,
+      compute_proportion_ci(pody.v, cts.n_pairs(), alpha[i], pody.vif,
                             pody.v_ncl[i], pody.v_ncu[i]);
-      compute_proportion_ci(podn.v, cts.total(), alpha[i], podn.vif,
+      compute_proportion_ci(podn.v, cts.n_pairs(), alpha[i], podn.vif,
                             podn.v_ncl[i], podn.v_ncu[i]);
-      compute_proportion_ci(pofd.v, cts.total(), alpha[i], pofd.vif,
+      compute_proportion_ci(pofd.v, cts.n_pairs(), alpha[i], pofd.vif,
                             pofd.v_ncl[i], pofd.v_ncu[i]);
-      compute_proportion_ci(far.v, cts.total(), alpha[i], far.vif,
+      compute_proportion_ci(far.v, cts.n_pairs(), alpha[i], far.vif,
                             far.v_ncl[i], far.v_ncu[i]);
-      compute_proportion_ci(csi.v, cts.total(), alpha[i], csi.vif,
+      compute_proportion_ci(csi.v, cts.n_pairs(), alpha[i], csi.vif,
                             csi.v_ncl[i], csi.v_ncu[i]);
 
       //
@@ -814,7 +814,7 @@ void MCTSInfo::compute_ci() {
       // Compute confidence intervals for the scores based on
       // proportions
       //
-      compute_proportion_ci(acc.v, cts.total(), alpha[i], acc.vif,
+      compute_proportion_ci(acc.v, cts.n_pairs(), alpha[i], acc.vif,
                             acc.v_ncl[i], acc.v_ncu[i]);
    } // end for i
 
@@ -3293,7 +3293,7 @@ void PCTInfo::compute_ci() {
    //
    for(i=0; i<n_alpha; i++) {
 
-      compute_proportion_ci(baser.v, pct.total(), alpha[i], baser.vif,
+      compute_proportion_ci(baser.v, pct.n_pairs(), alpha[i], baser.vif,
                             baser.v_ncl[i], baser.v_ncu[i]);
 
       // Compute brier CI using the VIF
@@ -3377,11 +3377,11 @@ double PCTInfo::get_stat_pct(const string &stat_name,
       col_name = "THRESH_I";
    }
    else if(check_reg_exp("OY_[0-9]", stat_name.c_str())){
-      v = (double) pct.event_total_by_row(i);
+      v = pct.event_total_by_row(i);
       col_name = "OY_I";
    }
    else if(check_reg_exp("ON_[0-9]", stat_name.c_str())) {
-      v = (double) pct.nonevent_total_by_row(i);
+      v = pct.nonevent_total_by_row(i);
       col_name = "ON_I";
    }
    else {
diff --git a/src/tools/core/stat_analysis/aggr_stat_line.cc b/src/tools/core/stat_analysis/aggr_stat_line.cc
index 8f34490a0b..bf95b6fea7 100644
--- a/src/tools/core/stat_analysis/aggr_stat_line.cc
+++ b/src/tools/core/stat_analysis/aggr_stat_line.cc
@@ -589,12 +589,16 @@ void aggr_summary_lines(LineDataFile &f, STATAnalysisJob &job,
                         int &n_in, int &n_out) {
    STATLine line;
    AggrSummaryInfo aggr;
-   ConcatString key, cs;
-   StringArray sa, req_stat, req_lty, req_col;
+   ConcatString cs;
+   StringArray sa;
+   StringArray req_stat;
+   StringArray req_lty;
+   StringArray req_col;
    STATLineType lty;
    NumArray empty_na;
-   int i, n_add;
-   double v, w;
+   int n_add;
+   double v;
+   double w;
 
    //
    // Objects for derived statistics
@@ -607,7 +611,7 @@ void aggr_summary_lines(LineDataFile &f, STATAnalysisJob &job,
    //
    // Build list of requested line types and column names
    //
-   for(i=0; i<job.column.n(); i++) {
+   for(int i=0; i<job.column.n(); i++) {
 
       // Split -column entry on colon
       sa = ConcatString(job.column[i]).split(":");
@@ -672,7 +676,7 @@ void aggr_summary_lines(LineDataFile &f, STATAnalysisJob &job,
          //
          // Build the map key for the current line
          //
-         key = job.get_case_info(line);
+         ConcatString key(job.get_case_info(line));
 
          //
          // Add a new map entry, if necessary
@@ -680,7 +684,7 @@ void aggr_summary_lines(LineDataFile &f, STATAnalysisJob &job,
          if(m.count(key) == 0) {
             aggr.val.clear();
             aggr.wgt.clear();
-            for(i=0; i<req_stat.n(); i++) {
+            for(int i=0; i<req_stat.n(); i++) {
                aggr.val[req_stat[i]] = empty_na;
                aggr.wgt[req_stat[i]] = empty_na;
             }
@@ -719,7 +723,7 @@ void aggr_summary_lines(LineDataFile &f, STATAnalysisJob &job,
          //
          // Update the map entries for each requested statistic
          //
-         for(i=0,n_add=0; i<req_col.n(); i++) {
+         for(int i=0, n_add=0; i<req_col.n(); i++) {
 
             //
             // Store the current requested line type
@@ -808,9 +812,7 @@ void aggr_ctc_lines(LineDataFile &f, STATAnalysisJob &job,
    STATLine line;
    AggrCTCInfo aggr;
    CTSInfo cur;
-   ConcatString key;
    unixtime ut;
-   int n, n_ties;
    map<ConcatString, AggrCTCInfo>::iterator it;
 
    //
@@ -860,7 +862,7 @@ void aggr_ctc_lines(LineDataFile &f, STATAnalysisJob &job,
          //
          // Build the map key for the current line
          //
-         key = job.get_case_info(line);
+         ConcatString key(job.get_case_info(line));
 
          //
          // Add a new map entry, if necessary
@@ -964,7 +966,8 @@ void aggr_ctc_lines(LineDataFile &f, STATAnalysisJob &job,
          //
          // Sort the valid times
          //
-         n = it->second.valid_ts.rank_array(n_ties);
+         int n_ties;
+	 int n = it->second.valid_ts.rank_array(n_ties);
 
          if(n_ties > 0 || n != it->second.valid_ts.n()) {
             mlog << Error << "\naggr_ctc_lines() -> "
@@ -1012,9 +1015,7 @@ void aggr_mctc_lines(LineDataFile &f, STATAnalysisJob &job,
    STATLine line;
    AggrMCTCInfo aggr;
    MCTSInfo cur;
-   ConcatString key;
    unixtime ut;
-   int i, k, n, n_ties;
    map<ConcatString, AggrMCTCInfo>::iterator it;
 
    //
@@ -1049,7 +1050,7 @@ void aggr_mctc_lines(LineDataFile &f, STATAnalysisJob &job,
          //
          // Build the map key for the current line
          //
-         key = job.get_case_info(line);
+         ConcatString key(job.get_case_info(line));
 
          //
          // Add a new map entry, if necessary
@@ -1086,8 +1087,8 @@ void aggr_mctc_lines(LineDataFile &f, STATAnalysisJob &job,
             //
             // Increment the counts
             //
-            for(i=0; i<m[key].mcts_info.cts.nrows(); i++) {
-               for(k=0; k<m[key].mcts_info.cts.ncols(); k++) {
+            for(int i=0; i<m[key].mcts_info.cts.nrows(); i++) {
+               for(int k=0; k<m[key].mcts_info.cts.ncols(); k++) {
                   m[key].mcts_info.cts.set_entry(i, k,
                                                  m[key].mcts_info.cts.entry(i, k) +
                                                  cur.cts.entry(i, k));
@@ -1160,7 +1161,8 @@ void aggr_mctc_lines(LineDataFile &f, STATAnalysisJob &job,
          //
          // Sort the valid times
          //
-         n = it->second.valid_ts.rank_array(n_ties);
+         int n_ties;
+	 int n = it->second.valid_ts.rank_array(n_ties);
 
          if(n_ties > 0 || n != it->second.valid_ts.n()) {
             mlog << Error << "\naggr_mctc_lines() -> "
@@ -1192,9 +1194,7 @@ void aggr_pct_lines(LineDataFile &f, STATAnalysisJob &job,
    STATLine line;
    AggrPCTInfo aggr;
    PCTInfo cur;
-   ConcatString key;
    unixtime ut;
-   int i, n, n_ties;
    map<ConcatString, AggrPCTInfo>::iterator it;
 
    //
@@ -1229,7 +1229,7 @@ void aggr_pct_lines(LineDataFile &f, STATAnalysisJob &job,
          //
          // Build the map key for the current line
          //
-         key = job.get_case_info(line);
+         ConcatString key(job.get_case_info(line));
 
          //
          // Add a new map entry, if necessary
@@ -1318,7 +1318,8 @@ void aggr_pct_lines(LineDataFile &f, STATAnalysisJob &job,
          //
          // Sort the valid times
          //
-         n = it->second.valid_ts.rank_array(n_ties);
+	 int n_ties;
+         int n = it->second.valid_ts.rank_array(n_ties);
 
          if(n_ties > 0 || n != it->second.valid_ts.n()) {
             mlog << Error << "\naggr_pct_lines() -> "
@@ -1355,9 +1356,7 @@ void aggr_psum_lines(LineDataFile &f, STATAnalysisJob &job,
    VL1L2Info cur_vl1l2;
    NBRCNTInfo cur_nbrcnt;
    CNTInfo cur_cnt;
-   ConcatString key;
    unixtime ut;
-   int n, n_ties;
    map<ConcatString, AggrPSumInfo>::iterator it;
 
    //
@@ -1423,7 +1422,7 @@ void aggr_psum_lines(LineDataFile &f, STATAnalysisJob &job,
          //
          // Build the map key for the current line
          //
-         key = job.get_case_info(line);
+         ConcatString key(job.get_case_info(line));
 
          //
          // Add a new map entry, if necessary
@@ -1519,7 +1518,8 @@ void aggr_psum_lines(LineDataFile &f, STATAnalysisJob &job,
          //
          // Sort the valid times
          //
-         n = it->second.valid_ts.rank_array(n_ties);
+         int n_ties;
+	 int n = it->second.valid_ts.rank_array(n_ties);
 
          if(n_ties > 0 || n != it->second.valid_ts.n()) {
             mlog << Error << "\naggr_psum_lines() -> "
@@ -1555,7 +1555,6 @@ void aggr_grad_lines(LineDataFile &f, STATAnalysisJob &job,
    STATLine line;
    AggrGRADInfo aggr;
    GRADInfo cur;
-   ConcatString key;
    map<ConcatString, AggrENSInfo>::iterator it;
 
    //
@@ -1586,7 +1585,7 @@ void aggr_grad_lines(LineDataFile &f, STATAnalysisJob &job,
          //
          // Build the map key for the current line
          //
-         key = job.get_case_info(line);
+         ConcatString key(job.get_case_info(line));
 
          //
          // Add a new map entry, if necessary
@@ -1645,8 +1644,10 @@ void aggr_wind_lines(LineDataFile &f, STATAnalysisJob &job,
    STATLine line;
    AggrWindInfo aggr;
    VL1L2Info cur;
-   ConcatString key;
-   double uf, vf, uo, vo;
+   double uf;
+   double vf;
+   double uo;
+   double vo;
 
    //
    // Process the STAT lines
@@ -1701,7 +1702,7 @@ void aggr_wind_lines(LineDataFile &f, STATAnalysisJob &job,
          //
          // Build the map key for the current line
          //
-         key = job.get_case_info(line);
+         ConcatString key(job.get_case_info(line));
 
          //
          // Add a new map entry, if necessary
@@ -1751,14 +1752,7 @@ void aggr_mpr_wind_lines(LineDataFile &f, STATAnalysisJob &job,
    AggrWindInfo aggr;
    VL1L2Info v_info;
    MPRData cur;
-   ConcatString hdr, key;
-   double uf, uo, ufcmn, ufcsd, uocmn, uocsd;
-   double vf, vo, vfcmn, vfcsd, vocmn, vocsd;
-   double fcst_wind, obs_wind;
-   double fcmn_wind, fcsd_wind;
-   double ocmn_wind, ocsd_wind;
-   bool is_ugrd;
-   int i;
+   ConcatString hdr;
    map<ConcatString, AggrWindInfo>::iterator it;
 
    //
@@ -1775,19 +1769,19 @@ void aggr_mpr_wind_lines(LineDataFile &f, STATAnalysisJob &job,
          job.dump_stat_line(line);
 
          parse_mpr_line(line, cur);
-         is_ugrd = (cur.fcst_var == ugrd_abbr_str);
-         uf      = (is_ugrd ? cur.fcst             : bad_data_double);
-         uo      = (is_ugrd ? cur.obs              : bad_data_double);
-         ufcmn   = (is_ugrd ? cur.fcst_climo_mean  : bad_data_double);
-         ufcsd   = (is_ugrd ? cur.fcst_climo_stdev : bad_data_double);
-         uocmn   = (is_ugrd ? cur.obs_climo_mean   : bad_data_double);
-         uocsd   = (is_ugrd ? cur.obs_climo_stdev  : bad_data_double);
-         vf      = (is_ugrd ? bad_data_double      : cur.fcst);
-         vo      = (is_ugrd ? bad_data_double      : cur.obs);
-         vfcmn   = (is_ugrd ? bad_data_double      : cur.fcst_climo_mean);
-         vfcsd   = (is_ugrd ? bad_data_double      : cur.fcst_climo_stdev);
-         vocmn   = (is_ugrd ? bad_data_double      : cur.obs_climo_mean);
-         vocsd   = (is_ugrd ? bad_data_double      : cur.obs_climo_stdev);
+         bool   is_ugrd = (cur.fcst_var == ugrd_abbr_str);
+         double uf      = (is_ugrd ? cur.fcst             : bad_data_double);
+         double uo      = (is_ugrd ? cur.obs              : bad_data_double);
+         double ufcmn   = (is_ugrd ? cur.fcst_climo_mean  : bad_data_double);
+         double ufcsd   = (is_ugrd ? cur.fcst_climo_stdev : bad_data_double);
+         double uocmn   = (is_ugrd ? cur.obs_climo_mean   : bad_data_double);
+         double uocsd   = (is_ugrd ? cur.obs_climo_stdev  : bad_data_double);
+         double vf      = (is_ugrd ? bad_data_double      : cur.fcst);
+         double vo      = (is_ugrd ? bad_data_double      : cur.obs);
+         double vfcmn   = (is_ugrd ? bad_data_double      : cur.fcst_climo_mean);
+         double vfcsd   = (is_ugrd ? bad_data_double      : cur.fcst_climo_stdev);
+         double vocmn   = (is_ugrd ? bad_data_double      : cur.obs_climo_mean);
+         double vocsd   = (is_ugrd ? bad_data_double      : cur.obs_climo_stdev);
 
          //
          // Build header string for matching UGRD and VGRD lines
@@ -1816,7 +1810,7 @@ void aggr_mpr_wind_lines(LineDataFile &f, STATAnalysisJob &job,
          //
          // Build the map key for the current line
          //
-         key = job.get_case_info(line);
+         ConcatString key(job.get_case_info(line));
 
          //
          // Add a new map entry, if necessary
@@ -1863,6 +1857,7 @@ void aggr_mpr_wind_lines(LineDataFile &f, STATAnalysisJob &job,
             //
             // Add data for existing header entry
             //
+            int i;
             if(m[key].hdr_sa.has(hdr, i)) {
 
                //
@@ -1945,7 +1940,7 @@ void aggr_mpr_wind_lines(LineDataFile &f, STATAnalysisJob &job,
       //
       // Loop over the pairs for the current map entry
       //
-      for(i=0; i<it->second.hdr_sa.n(); i++) {
+      for(int i=0; i<it->second.hdr_sa.n(); i++) {
 
          //
          // Check for missing UGRD data
@@ -1976,18 +1971,18 @@ void aggr_mpr_wind_lines(LineDataFile &f, STATAnalysisJob &job,
             job.out_obs_wind_thresh.get_type()  != thresh_na) {
 
             // Compute wind speeds
-            fcst_wind  = convert_u_v_to_wind(it->second.pd_u.f_na[i],
-                                             it->second.pd_v.f_na[i]);
-             obs_wind  = convert_u_v_to_wind(it->second.pd_u.o_na[i],
-                                             it->second.pd_v.o_na[i]);
-             fcmn_wind = convert_u_v_to_wind(it->second.pd_u.fcmn_na[i],
-                                             it->second.pd_v.fcmn_na[i]);
-             fcsd_wind = convert_u_v_to_wind(it->second.pd_u.fcsd_na[i],
-                                             it->second.pd_v.fcsd_na[i]);
-             ocmn_wind = convert_u_v_to_wind(it->second.pd_u.ocmn_na[i],
-                                             it->second.pd_v.ocmn_na[i]);
-             ocsd_wind = convert_u_v_to_wind(it->second.pd_u.ocsd_na[i],
-                                             it->second.pd_v.ocsd_na[i]);
+            double fcst_wind = convert_u_v_to_wind(it->second.pd_u.f_na[i],
+                                                   it->second.pd_v.f_na[i]);
+            double obs_wind  = convert_u_v_to_wind(it->second.pd_u.o_na[i],
+                                                   it->second.pd_v.o_na[i]);
+            double fcmn_wind = convert_u_v_to_wind(it->second.pd_u.fcmn_na[i],
+                                                   it->second.pd_v.fcmn_na[i]);
+            double fcsd_wind = convert_u_v_to_wind(it->second.pd_u.fcsd_na[i],
+                                                   it->second.pd_v.fcsd_na[i]);
+            double ocmn_wind = convert_u_v_to_wind(it->second.pd_u.ocmn_na[i],
+                                                   it->second.pd_v.ocmn_na[i]);
+            double ocsd_wind = convert_u_v_to_wind(it->second.pd_u.ocsd_na[i],
+                                                   it->second.pd_v.ocsd_na[i]);
 
             // Store climo data
             ClimoPntInfo cpi(fcmn_wind, fcsd_wind, ocmn_wind, ocsd_wind);
@@ -2050,8 +2045,12 @@ void aggr_mpr_wind_lines(LineDataFile &f, STATAnalysisJob &job,
          //
          ClimoPntInfo cpi;
          aggr.hdr_sa.add(it->second.hdr_sa[i]);
+         double uf;
+         double vf;
          convert_u_v_to_unit(it->second.pd_u.f_na[i],
                              it->second.pd_v.f_na[i], uf, vf);
+         double uo;
+         double vo;
          convert_u_v_to_unit(it->second.pd_u.o_na[i],
                              it->second.pd_v.o_na[i], uo, vo);
          aggr.pd_u.add_grid_pair(uf, uo, cpi, default_grid_weight);
@@ -2075,7 +2074,6 @@ void aggr_mpr_lines(LineDataFile &f, STATAnalysisJob &job,
    STATLine line;
    AggrMPRInfo aggr;
    MPRData cur;
-   ConcatString key;
 
    //
    // Process the STAT lines
@@ -2113,7 +2111,7 @@ void aggr_mpr_lines(LineDataFile &f, STATAnalysisJob &job,
          //
          // Build the map key for the current line
          //
-         key = job.get_case_info(line);
+         ConcatString key(job.get_case_info(line));
 
          //
          // Add a new map entry, if necessary
@@ -2204,9 +2202,8 @@ void aggr_isc_lines(LineDataFile &ldf, STATAnalysisJob &job,
    STATLine line;
    AggrISCInfo aggr;
    ISCInfo cur;
-   ConcatString key;
-   int i, k, iscale;
-   double total, w, den, baser_fbias_sum;
+   int iscale;
+   double den;
    map<ConcatString, AggrISCInfo>::iterator it;
 
    //
@@ -2245,7 +2242,7 @@ void aggr_isc_lines(LineDataFile &ldf, STATAnalysisJob &job,
          //
          // Build the map key for the current line
          //
-         key = job.get_case_info(line);
+         ConcatString key(job.get_case_info(line));
 
          //
          // Add a new map entry, if necessary
@@ -2354,20 +2351,20 @@ void aggr_isc_lines(LineDataFile &ldf, STATAnalysisJob &job,
       // Get the sum of the totals, compute the weight, and sum the
       // weighted scores
       //
-      for(i=0; i<it->second.isc_info.n_scale+2; i++) {
+      for(int i=0; i<it->second.isc_info.n_scale+2; i++) {
 
          // Total number of points for this scale
-         total = it->second.total_na[i].sum();
+         double total = it->second.total_na[i].sum();
 
          // Initialize
-         baser_fbias_sum = 0.0;
+         double baser_fbias_sum = 0.0;
 
          // Loop through all scores for this scale
-         for(k=0; k<it->second.total_na[i].n(); k++) {
+         for(int k=0; k<it->second.total_na[i].n(); k++) {
 
             // Compute the weight for each score to be aggregated
             // based on the number of points it represents
-            w = it->second.total_na[i][k]/total;
+            double w = it->second.total_na[i][k]/total;
 
             // Sum scores for the binary fields
             if(i == 0) {
@@ -2463,8 +2460,7 @@ void aggr_ecnt_lines(LineDataFile &f, STATAnalysisJob &job,
    STATLine line;
    AggrENSInfo aggr;
    ECNTData cur;
-   ConcatString key;
-   double crps_emp, crps_emp_fair, spread_md, crpscl_emp, crps_gaus, crpscl_gaus, v;
+   double v;
    map<ConcatString, AggrENSInfo>::iterator it;
 
    //
@@ -2496,7 +2492,7 @@ void aggr_ecnt_lines(LineDataFile &f, STATAnalysisJob &job,
          //
          // Build the map key for the current line
          //
-         key = job.get_case_info(line);
+         ConcatString key(job.get_case_info(line));
 
          //
          // Add a new map entry, if necessary
@@ -2582,12 +2578,12 @@ void aggr_ecnt_lines(LineDataFile &f, STATAnalysisJob &job,
       v                            = it->second.mse_oerr_na.wmean(it->second.ens_pd.wgt_na);
       it->second.ens_pd.rmse_oerr  = (is_bad_data(v) ? bad_data_double : sqrt(v));
 
-      crps_emp      = it->second.ens_pd.crps_emp_na.wmean(it->second.ens_pd.wgt_na);
-      crps_emp_fair = it->second.ens_pd.crps_emp_fair_na.wmean(it->second.ens_pd.wgt_na);
-      spread_md     = it->second.ens_pd.spread_md_na.wmean(it->second.ens_pd.wgt_na);
-      crpscl_emp    = it->second.ens_pd.crpscl_emp_na.wmean(it->second.ens_pd.wgt_na);
-      crps_gaus     = it->second.ens_pd.crps_gaus_na.wmean(it->second.ens_pd.wgt_na);
-      crpscl_gaus   = it->second.ens_pd.crpscl_gaus_na.wmean(it->second.ens_pd.wgt_na);
+      double crps_emp      = it->second.ens_pd.crps_emp_na.wmean(it->second.ens_pd.wgt_na);
+      double crps_emp_fair = it->second.ens_pd.crps_emp_fair_na.wmean(it->second.ens_pd.wgt_na);
+      double spread_md     = it->second.ens_pd.spread_md_na.wmean(it->second.ens_pd.wgt_na);
+      double crpscl_emp    = it->second.ens_pd.crpscl_emp_na.wmean(it->second.ens_pd.wgt_na);
+      double crps_gaus     = it->second.ens_pd.crps_gaus_na.wmean(it->second.ens_pd.wgt_na);
+      double crpscl_gaus   = it->second.ens_pd.crpscl_gaus_na.wmean(it->second.ens_pd.wgt_na);
 
       // Compute aggregated empirical CRPSS
       it->second.ens_pd.crpss_emp =
@@ -2612,7 +2608,6 @@ void aggr_rps_lines(LineDataFile &f, STATAnalysisJob &job,
    STATLine line;
    AggrRPSInfo aggr;
    RPSInfo cur;
-   ConcatString key;
    map<ConcatString, AggrRPSInfo>::iterator it;
 
    //
@@ -2647,7 +2642,7 @@ void aggr_rps_lines(LineDataFile &f, STATAnalysisJob &job,
          //
          // Build the map key for the current line
          //
-         key = job.get_case_info(line);
+         ConcatString key(job.get_case_info(line));
 
          //
          // Add a new map entry, if necessary
@@ -2706,8 +2701,6 @@ void aggr_rhist_lines(LineDataFile &f, STATAnalysisJob &job,
    STATLine line;
    AggrENSInfo aggr;
    RHISTData cur;
-   ConcatString key;
-   int i;
    map<ConcatString, AggrENSInfo>::iterator it;
 
    //
@@ -2739,14 +2732,14 @@ void aggr_rhist_lines(LineDataFile &f, STATAnalysisJob &job,
          //
          // Build the map key for the current line
          //
-         key = job.get_case_info(line);
+         ConcatString key(job.get_case_info(line));
 
          //
          // Add a new map entry, if necessary
          //
          if(m.count(key) == 0) {
             aggr.clear();
-            for(i=0; i<cur.n_rank; i++) aggr.ens_pd.rhist_na.add(0);
+            for(int i=0; i<cur.n_rank; i++) aggr.ens_pd.rhist_na.add(0);
             m[key] = aggr;
             mlog << Debug(3) << "[Case " << m.size()
                  << "] Added new case for key \""
@@ -2772,7 +2765,7 @@ void aggr_rhist_lines(LineDataFile &f, STATAnalysisJob &job,
          //
          // Aggregate the ranked histogram counts
          //
-         for(i=0; i<m[key].ens_pd.rhist_na.n(); i++) {
+         for(int i=0; i<m[key].ens_pd.rhist_na.n(); i++) {
             m[key].ens_pd.rhist_na.set(i, m[key].ens_pd.rhist_na[i] + cur.rhist_na[i]);
          }
 
@@ -2796,8 +2789,6 @@ void aggr_phist_lines(LineDataFile &f, STATAnalysisJob &job,
    STATLine line;
    AggrENSInfo aggr;
    PHISTData cur;
-   ConcatString key;
-   int i;
    map<ConcatString, AggrENSInfo>::iterator it;
 
    //
@@ -2829,7 +2820,7 @@ void aggr_phist_lines(LineDataFile &f, STATAnalysisJob &job,
          //
          // Build the map key for the current line
          //
-         key = job.get_case_info(line);
+         ConcatString key(job.get_case_info(line));
 
          //
          // Add a new map entry, if necessary
@@ -2862,7 +2853,7 @@ void aggr_phist_lines(LineDataFile &f, STATAnalysisJob &job,
             //
             // Aggregate the probability integral transform histogram counts
             //
-            for(i=0; i<m[key].ens_pd.phist_na.n(); i++) {
+            for(int i=0; i<m[key].ens_pd.phist_na.n(); i++) {
                m[key].ens_pd.phist_na.set(i, m[key].ens_pd.phist_na[i] + cur.phist_na[i]);
             }
          } // end else
@@ -2887,8 +2878,6 @@ void aggr_relp_lines(LineDataFile &f, STATAnalysisJob &job,
    STATLine line;
    AggrENSInfo aggr;
    RELPData cur;
-   ConcatString key;
-   int i;
    map<ConcatString, AggrENSInfo>::iterator it;
 
    //
@@ -2920,7 +2909,7 @@ void aggr_relp_lines(LineDataFile &f, STATAnalysisJob &job,
          //
          // Build the map key for the current line
          //
-         key = job.get_case_info(line);
+         ConcatString key(job.get_case_info(line));
 
          //
          // Add a new map entry, if necessary
@@ -2952,7 +2941,7 @@ void aggr_relp_lines(LineDataFile &f, STATAnalysisJob &job,
             //
             // Aggregate the RELP histogram counts
             //
-            for(i=0; i<m[key].ens_pd.relp_na.n(); i++) {
+            for(int i=0; i<m[key].ens_pd.relp_na.n(); i++) {
                m[key].ens_pd.relp_na.set(i, m[key].ens_pd.relp_na[i] + cur.relp_na[i]);
             }
          } // end else
@@ -2977,10 +2966,7 @@ void aggr_orank_lines(LineDataFile &f, STATAnalysisJob &job,
    STATLine line;
    AggrENSInfo aggr;
    ORANKData cur;
-   ConcatString key;
    NumArray climo_vals;
-   int i, n_valid, n_bin;
-   double esum, esumsq;
    map<ConcatString, AggrENSInfo>::iterator it;
 
    //
@@ -3012,7 +2998,7 @@ void aggr_orank_lines(LineDataFile &f, STATAnalysisJob &job,
          //
          // Build the map key for the current line
          //
-         key = job.get_case_info(line);
+         ConcatString key(job.get_case_info(line));
 
          //
          // Skip missing data
@@ -3029,10 +3015,10 @@ void aggr_orank_lines(LineDataFile &f, STATAnalysisJob &job,
             aggr.ens_pd.obs_error_flag = !is_bad_data(cur.ens_mean_oerr);
             aggr.ens_pd.set_ens_size(cur.n_ens);
             aggr.ens_pd.extend(cur.total);
-            for(i=0; i<cur.n_ens+1; i++) aggr.ens_pd.rhist_na.add(0);
+            for(int i=0; i<cur.n_ens+1; i++) aggr.ens_pd.rhist_na.add(0);
             aggr.ens_pd.phist_bin_size = job.out_bin_size;
-            n_bin = ceil(1.0/aggr.ens_pd.phist_bin_size);
-            for(i=0; i<n_bin; i++) aggr.ens_pd.phist_na.add(0);
+            int n_bin = ceil(1.0/aggr.ens_pd.phist_bin_size);
+            for(int i=0; i<n_bin; i++) aggr.ens_pd.phist_na.add(0);
             aggr.ens_pd.ssvar_bin_size = job.out_bin_size;
 
             bool center = false;
@@ -3075,8 +3061,10 @@ void aggr_orank_lines(LineDataFile &f, STATAnalysisJob &job,
          m[key].ens_pd.mn_na.add(cur.ens_mean);
          m[key].ens_pd.mn_oerr_na.add(cur.ens_mean_oerr);
 
-         for(i=0, n_valid=0, esum=0.0, esumsq=0.0;
-             i<m[key].ens_pd.n_ens; i++) {
+         int n_valid = 0;
+         double esum = 0.0;
+         double esumsq = 0.0;
+         for(int i=0; i<m[key].ens_pd.n_ens; i++) {
             m[key].ens_pd.add_ens(i, cur.ens_na[i]);
             if(!is_bad_data(cur.ens_na[i])) {
                esum   += cur.ens_na[i];
@@ -3114,8 +3102,10 @@ void aggr_orank_lines(LineDataFile &f, STATAnalysisJob &job,
          }
 
          // Store BIAS_RATIO terms
-         int n_ge_obs, n_lt_obs;
-         double me_ge_obs, me_lt_obs;
+         int n_ge_obs;
+	 int n_lt_obs;
+         double me_ge_obs;
+	 double me_lt_obs;
          compute_bias_ratio_terms(
             cur.obs, cur.ens_na,
             n_ge_obs, me_ge_obs,
@@ -3126,7 +3116,8 @@ void aggr_orank_lines(LineDataFile &f, STATAnalysisJob &job,
          m[key].ens_pd.me_lt_obs_na.add(me_lt_obs);
 
          // Compute observation error log scores
-         double v_conv, v_corr;
+         double v_conv;
+	 double v_corr;
          compute_obs_error_log_scores(
             cur.ens_mean, cur.spread, cur.obs, oerr_var,
             v_conv, v_corr);
@@ -3136,7 +3127,7 @@ void aggr_orank_lines(LineDataFile &f, STATAnalysisJob &job,
          //
          // Increment the RHIST counts
          //
-         i = cur.rank - 1;
+         int i = cur.rank - 1;
          m[key].ens_pd.rhist_na.set(i, m[key].ens_pd.rhist_na[i] + 1);
 
          //
@@ -3169,8 +3160,9 @@ void aggr_ssvar_lines(LineDataFile &f, STATAnalysisJob &job,
    STATLine line;
    AggrSSVARInfo aggr;
    SSVARInfo cur;
-   ConcatString case_key, bin_key;
-   ConcatString fcst_var, obs_var;
+   ConcatString bin_key;
+   ConcatString fcst_var;
+   ConcatString obs_var;
    double bin_width = bad_data_double;
 
    //
@@ -3231,8 +3223,9 @@ void aggr_ssvar_lines(LineDataFile &f, STATAnalysisJob &job,
          //
          // Build the case map and bin map keys for the current line
          //
-         case_key = job.get_case_info(line);
-         bin_key << cs_erase << cur.var_min << ":" << cur.var_max;
+         ConcatString case_key(job.get_case_info(line));
+         ConcatString bin_key;
+         bin_key << cur.var_min << ":" << cur.var_max;
 
          //
          // Add a new case map entry, if necessary
@@ -3276,7 +3269,8 @@ void aggr_seeps_lines(LineDataFile &f, STATAnalysisJob &job,
    STATLine line;
    AggrSEEPSInfo aggr;
    SeepsAggScore cur;
-   ConcatString key, fcst_var, obs_var;
+   ConcatString fcst_var;
+   ConcatString obs_var;
 
    //
    // Process the STAT lines
@@ -3322,7 +3316,7 @@ void aggr_seeps_lines(LineDataFile &f, STATAnalysisJob &job,
          //
          // Build the map key for the current line
          //
-         key = job.get_case_info(line);
+         ConcatString key(job.get_case_info(line));
 
          //
          // Add a new map entry, if necessary
@@ -3360,7 +3354,8 @@ void aggr_seeps_mpr_lines(LineDataFile &f, STATAnalysisJob &job,
    STATLine line;
    AggrSEEPSMPRInfo aggr;
    SEEPSMPRData cur;
-   ConcatString key, fcst_var, obs_var;
+   ConcatString fcst_var;
+   ConcatString obs_var;
 
    //
    // Process the STAT lines
@@ -3406,7 +3401,7 @@ void aggr_seeps_mpr_lines(LineDataFile &f, STATAnalysisJob &job,
          //
          // Build the map key for the current line
          //
-         key = job.get_case_info(line);
+         ConcatString key(job.get_case_info(line));
 
          //
          // Add a new map entry, if necessary
@@ -3453,7 +3448,6 @@ void aggr_time_series_lines(LineDataFile &f, STATAnalysisJob &job,
                             int &n_in, int &n_out) {
    STATLine line;
    AggrTimeSeriesInfo cur;
-   ConcatString key;
    int lead_sec;
    unixtime init_ut, valid_ut;
 
@@ -3473,7 +3467,7 @@ void aggr_time_series_lines(LineDataFile &f, STATAnalysisJob &job,
          //
          // Build the map key for the current line
          //
-         key = job.get_case_info(line);
+         ConcatString key(job.get_case_info(line));
 
          //
          // Add a new map entry, if necessary
@@ -3558,8 +3552,6 @@ void aggr_ss_index(LineDataFile &f, STATAnalysisJob &job,
                    int &n_in, int &n_out) {
    STATLine line;
    AggrSSIndexInfo cur;
-   ConcatString key;
-   int i, n_term;
 
    //
    // Store the index name and valid data threshold
@@ -3591,6 +3583,7 @@ void aggr_ss_index(LineDataFile &f, STATAnalysisJob &job,
    //
    // Compute the number of terms as the maximum array length
    //
+   int n_term;
    n_term = max(     0, job.fcst_var.n());
    n_term = max(n_term, job.fcst_lev.n());
    n_term = max(n_term, job.fcst_lead.n());
@@ -3628,7 +3621,7 @@ void aggr_ss_index(LineDataFile &f, STATAnalysisJob &job,
    //
    // Create a job for each term
    //
-   for(i=0; i<n_term; i++) {
+   for(int i=0; i<n_term; i++) {
 
       //
       // Create a STATAnalysisJob for each term
@@ -3709,7 +3702,7 @@ void aggr_ss_index(LineDataFile &f, STATAnalysisJob &job,
          //
          // Build the map key for the current line
          //
-         key = job.get_case_info(line);
+         ConcatString key(job.get_case_info(line));
 
          //
          // Add a new map entry, if necessary
@@ -3747,7 +3740,6 @@ void aggr_ss_index(LineDataFile &f, STATAnalysisJob &job,
 
 void mpr_to_ctc(STATAnalysisJob &job, const AggrMPRInfo &info,
                 int i_thresh, CTSInfo &cts_info) {
-   int i;
 
    //
    // Initialize
@@ -3760,7 +3752,7 @@ void mpr_to_ctc(STATAnalysisJob &job, const AggrMPRInfo &info,
    //
    // Populate the contingency table
    //
-   for(i=0; i<info.pd.n_obs; i++) {
+   for(int i=0; i<info.pd.n_obs; i++) {
       ClimoPntInfo cpi(info.pd.fcmn_na[i], info.pd.fcsd_na[i],
                        info.pd.ocmn_na[i], info.pd.ocsd_na[i]);
       cts_info.add(info.pd.f_na[i], info.pd.o_na[i], 1.0, &cpi);
@@ -3820,7 +3812,6 @@ void mpr_to_cts(STATAnalysisJob &job, const AggrMPRInfo &info,
 
 void mpr_to_mctc(STATAnalysisJob &job, const AggrMPRInfo &info,
                  MCTSInfo &mcts_info) {
-   int i;
    int n = info.pd.f_na.n();
 
    //
@@ -3835,7 +3826,7 @@ void mpr_to_mctc(STATAnalysisJob &job, const AggrMPRInfo &info,
    //
    // Update the contingency table counts
    //
-   for(i=0; i<n; i++) {
+   for(int i=0; i<n; i++) {
       ClimoPntInfo cpi(info.pd.fcmn_na[i], info.pd.fcsd_na[i],
                        info.pd.ocmn_na[i], info.pd.ocsd_na[i]);
       mcts_info.add(info.pd.f_na[i], info.pd.o_na[i], 1.0, &cpi);
@@ -4100,13 +4091,12 @@ void mpr_to_pct(STATAnalysisJob &job, const AggrMPRInfo &info,
 ////////////////////////////////////////////////////////////////////////
 
 double compute_vif(NumArray &na) {
-   double corr, vif;
 
    // Compute the lag1 autocorrelation
-   corr = stats_lag1_autocorrelation(na);
+   double corr = stats_lag1_autocorrelation(na);
 
    // Compute the variance inflation factor
-   vif = 1 + 2.0*fabs(corr) - 2.0*fabs(corr)/na.n();
+   double vif = 1 + 2.0*fabs(corr) - 2.0*fabs(corr)/na.n();
 
    return vif;
 }
diff --git a/src/tools/core/stat_analysis/parse_stat_line.cc b/src/tools/core/stat_analysis/parse_stat_line.cc
index f347d87915..467920751f 100644
--- a/src/tools/core/stat_analysis/parse_stat_line.cc
+++ b/src/tools/core/stat_analysis/parse_stat_line.cc
@@ -112,19 +112,18 @@ void parse_ctc_ctable(STATLine &l, TTContingencyTable &ct) {
 ////////////////////////////////////////////////////////////////////////
 
 void parse_mctc_ctable(STATLine &l, ContingencyTable &ct) {
-   int n_cat, i, j;
    char col_str[max_str_len];
 
    // N_CAT
-   n_cat = atoi(l.get_item("N_CAT"));
+   int n_cat = atoi(l.get_item("N_CAT"));
    ct.set_size(n_cat);
 
    // Npairs 
    ct.set_n_pairs(atoi(l.get_item("TOTAL")));
 
    // Fi_Oj
-   for(i=0; i<n_cat; i++) {
-      for(j=0; j<n_cat; j++) {
+   for(int i=0; i<n_cat; i++) {
+      for(int j=0; j<n_cat; j++) {
          snprintf(col_str, sizeof(col_str), "F%i_O%i", i+1, j+1);
          ct.set_entry(i, j, atof(l.get_item(col_str)));
       }
@@ -161,11 +160,10 @@ void parse_nbrctc_ctable(STATLine &l, TTContingencyTable &ct) {
 ////////////////////////////////////////////////////////////////////////
 
 void parse_nx2_ctable(STATLine &l, Nx2ContingencyTable &pct) {
-   int i, n, oy, on;
    char col_str[max_str_len];
 
    // N_THRESH
-   n = atoi(l.get_item("N_THRESH"));
+   int n = atoi(l.get_item("N_THRESH"));
    pct.set_size(n-1);
 
    // Npairs 
@@ -174,7 +172,7 @@ void parse_nx2_ctable(STATLine &l, Nx2ContingencyTable &pct) {
    // Store a vector of threshold values
    vector<double> thresh(n);
 
-   for(i=0; i<n-1; i++) {
+   for(int i=0; i<n-1; i++) {
 
       // THRESH_i
       snprintf(col_str, sizeof(col_str), "THRESH_%i", i+1);
@@ -182,12 +180,12 @@ void parse_nx2_ctable(STATLine &l, Nx2ContingencyTable &pct) {
 
       // OY_i
       snprintf(col_str, sizeof(col_str), "OY_%i", i+1);
-      oy = atof(l.get_item(col_str));
+      double oy = atof(l.get_item(col_str));
       pct.set_entry(i, nx2_event_column, oy);
 
       // ON_i
       snprintf(col_str, sizeof(col_str), "ON_%i", i+1);
-      on = atof(l.get_item(col_str));
+      double on = atof(l.get_item(col_str));
       pct.set_entry(i, nx2_nonevent_column, on);
    }
 
@@ -465,7 +463,6 @@ void parse_rps_line(STATLine &l, RPSInfo &r_info) {
 ////////////////////////////////////////////////////////////////////////
 
 void parse_rhist_line(STATLine &l, RHISTData &r_data) {
-   int i;
    char col_str[max_str_len];
 
    r_data.total  = atoi(l.get_item("TOTAL"));
@@ -474,7 +471,7 @@ void parse_rhist_line(STATLine &l, RHISTData &r_data) {
    r_data.rhist_na.clear();
 
    // Parse out RANK_i
-   for(i=0; i<r_data.n_rank; i++) {
+   for(int i=0; i<r_data.n_rank; i++) {
       snprintf(col_str, sizeof(col_str), "RANK_%i", i+1);
       r_data.rhist_na.add(atoi(l.get_item(col_str)));
    }
@@ -485,7 +482,6 @@ void parse_rhist_line(STATLine &l, RHISTData &r_data) {
 ////////////////////////////////////////////////////////////////////////
 
 void parse_phist_line(STATLine &l, PHISTData &p_data) {
-   int i;
    char col_str[max_str_len];
 
    p_data.total    = atoi(l.get_item("TOTAL"));
@@ -495,7 +491,7 @@ void parse_phist_line(STATLine &l, PHISTData &p_data) {
    p_data.phist_na.clear();
 
    // Parse out BIN_i
-   for(i=0; i<p_data.n_bin; i++) {
+   for(int i=0; i<p_data.n_bin; i++) {
       snprintf(col_str, sizeof(col_str), "BIN_%i", i+1);
       p_data.phist_na.add(atoi(l.get_item(col_str)));
    }
@@ -506,7 +502,6 @@ void parse_phist_line(STATLine &l, PHISTData &p_data) {
 ////////////////////////////////////////////////////////////////////////
 
 void parse_relp_line(STATLine &l, RELPData &r_data) {
-   int i;
    char col_str[max_str_len];
 
    r_data.total    = atoi(l.get_item("TOTAL"));
@@ -515,7 +510,7 @@ void parse_relp_line(STATLine &l, RELPData &r_data) {
    r_data.relp_na.clear();
 
    // Parse out RELP_i
-   for(i=0; i<r_data.n_ens; i++) {
+   for(int i=0; i<r_data.n_ens; i++) {
       snprintf(col_str, sizeof(col_str), "RELP_%i", i+1);
       r_data.relp_na.add(atof(l.get_item(col_str)));
    }
@@ -526,7 +521,6 @@ void parse_relp_line(STATLine &l, RELPData &r_data) {
 ////////////////////////////////////////////////////////////////////////
 
 void parse_orank_line(STATLine &l, ORANKData &o_data) {
-   int i, ens1;
 
    o_data.total     = atoi(l.get_item("TOTAL"));
    o_data.index     = atoi(l.get_item("INDEX"));
@@ -545,9 +539,9 @@ void parse_orank_line(STATLine &l, ORANKData &o_data) {
 
    // Parse out ENS_i
    o_data.ens_na.erase();
-   ens1 = l.get_offset("ENS_1");
-   for(i=0; i<o_data.n_ens; i++) {
-      o_data.ens_na.add(atof(l.get_item(ens1+i)));
+   int ens_1_offset = l.get_offset("ENS_1");
+   for(int i=0; i<o_data.n_ens; i++) {
+      o_data.ens_na.add(atof(l.get_item(ens_1_offset+i)));
    }
 
    o_data.obs_qc           =      l.get_item("OBS_QC", false);