=== modified file 'uc_store/countries/canada_124_1.cif'
--- uc_store/countries/canada_124_1.cif	2008-10-28 12:57:40 +0000
+++ uc_store/countries/canada_124_1.cif	2009-07-08 19:29:51 +0000
@@ -5,21 +5,26 @@
   // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
   db_query("INSERT INTO {uc_countries} VALUES (124, 'Canada', 'CA', 'CAN', 1)");
 
+  $zones = array(
+    array(124, 'AB', 'Alberta'),
+    array(124, 'BC', 'British Columbia'),
+    array(124, 'MB', 'Manitoba'),
+    array(124, 'NF', 'Newfoundland'),
+    array(124, 'NB', 'New Brunswick'),
+    array(124, 'NS', 'Nova Scotia'),
+    array(124, 'NT', 'Northwest Territories'),
+    array(124, 'NU', 'Nunavut'),
+    array(124, 'ON', 'Ontario'),
+    array(124, 'PE', 'Prince Edward Island'),
+    array(124, 'QC', 'Quebec'),
+    array(124, 'SK', 'Saskatchewan'),
+    array(124, 'YT', 'Yukon Territory'),
+  );
+
   // Make the entries in the zones table.
-  db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES "
-          ."(124, 'AB', 'Alberta'),"
-          ."(124, 'BC', 'British Columbia'),"
-          ."(124, 'MB', 'Manitoba'),"
-          ."(124, 'NF', 'Newfoundland'),"
-          ."(124, 'NB', 'New Brunswick'),"
-          ."(124, 'NS', 'Nova Scotia'),"
-          ."(124, 'NT', 'Northwest Territories'),"
-          ."(124, 'NU', 'Nunavut'),"
-          ."(124, 'ON', 'Ontario'),"
-          ."(124, 'PE', 'Prince Edward Island'),"
-          ."(124, 'QC', 'Quebec'),"
-          ."(124, 'SK', 'Saskatchewan'),"
-          ."(124, 'YT', 'Yukon Territory')");
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
 
   variable_set('uc_address_format_124',
                "!company\r\n!first_name !last_name\r\n!street1\r\n!street2"

=== modified file 'uc_store/countries/united_states_840_1.cif'
--- uc_store/countries/united_states_840_1.cif	2008-10-28 12:57:40 +0000
+++ uc_store/countries/united_states_840_1.cif	2009-07-08 19:19:46 +0000
@@ -5,73 +5,78 @@
   // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
   db_query("INSERT INTO {uc_countries} VALUES (840, 'United States', 'US', 'USA', 1)");
 
+  $zones = array(
+    array(840, 'AL', 'Alabama'),
+    array(840, 'AK', 'Alaska'),
+    array(840, 'AS', 'American Samoa'),
+    array(840, 'AZ', 'Arizona'),
+    array(840, 'AR', 'Arkansas'),
+    array(840, 'AF', 'Armed Forces Africa'),
+    array(840, 'AA', 'Armed Forces Americas'),
+    array(840, 'AC', 'Armed Forces Canada'),
+    array(840, 'AE', 'Armed Forces Europe'),
+    array(840, 'AM', 'Armed Forces Middle East'),
+    array(840, 'AP', 'Armed Forces Pacific'),
+    array(840, 'CA', 'California'),
+    array(840, 'CO', 'Colorado'),
+    array(840, 'CT', 'Connecticut'),
+    array(840, 'DE', 'Delaware'),
+    array(840, 'DC', 'District of Columbia'),
+    array(840, 'FM', 'Federated States Of Micronesia'),
+    array(840, 'FL', 'Florida'),
+    array(840, 'GA', 'Georgia'),
+    array(840, 'GU', 'Guam'),
+    array(840, 'HI', 'Hawaii'),
+    array(840, 'ID', 'Idaho'),
+    array(840, 'IL', 'Illinois'),
+    array(840, 'IN', 'Indiana'),
+    array(840, 'IA', 'Iowa'),
+    array(840, 'KS', 'Kansas'),
+    array(840, 'KY', 'Kentucky'),
+    array(840, 'LA', 'Louisiana'),
+    array(840, 'ME', 'Maine'),
+    array(840, 'MH', 'Marshall Islands'),
+    array(840, 'MD', 'Maryland'),
+    array(840, 'MA', 'Massachusetts'),
+    array(840, 'MI', 'Michigan'),
+    array(840, 'MN', 'Minnesota'),
+    array(840, 'MS', 'Mississippi'),
+    array(840, 'MO', 'Missouri'),
+    array(840, 'MT', 'Montana'),
+    array(840, 'NE', 'Nebraska'),
+    array(840, 'NV', 'Nevada'),
+    array(840, 'NH', 'New Hampshire'),
+    array(840, 'NJ', 'New Jersey'),
+    array(840, 'NM', 'New Mexico'),
+    array(840, 'NY', 'New York'),
+    array(840, 'NC', 'North Carolina'),
+    array(840, 'ND', 'North Dakota'),
+    array(840, 'MP', 'Northern Mariana Islands'),
+    array(840, 'OH', 'Ohio'),
+    array(840, 'OK', 'Oklahoma'),
+    array(840, 'OR', 'Oregon'),
+    array(840, 'PW', 'Palau'),
+    array(840, 'PA', 'Pennsylvania'),
+    array(840, 'PR', 'Puerto Rico'),
+    array(840, 'RI', 'Rhode Island'),
+    array(840, 'SC', 'South Carolina'),
+    array(840, 'SD', 'South Dakota'),
+    array(840, 'TN', 'Tennessee'),
+    array(840, 'TX', 'Texas'),
+    array(840, 'UT', 'Utah'),
+    array(840, 'VT', 'Vermont'),
+    array(840, 'VI', 'Virgin Islands'),
+    array(840, 'VA', 'Virginia'),
+    array(840, 'WA', 'Washington'),
+    array(840, 'WV', 'West Virginia'),
+    array(840, 'WI', 'Wisconsin'),
+    array(840, 'WY', 'Wyoming'),
+  );
+
   // Make the entries in the zones table.
-  db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES "
-          ."(840, 'AL', 'Alabama'),"
-          ."(840, 'AK', 'Alaska'),"
-          ."(840, 'AS', 'American Samoa'),"
-          ."(840, 'AZ', 'Arizona'),"
-          ."(840, 'AR', 'Arkansas'),"
-          ."(840, 'AF', 'Armed Forces Africa'),"
-          ."(840, 'AA', 'Armed Forces Americas'),"
-          ."(840, 'AC', 'Armed Forces Canada'),"
-          ."(840, 'AE', 'Armed Forces Europe'),"
-          ."(840, 'AM', 'Armed Forces Middle East'),"
-          ."(840, 'AP', 'Armed Forces Pacific'),"
-          ."(840, 'CA', 'California'),"
-          ."(840, 'CO', 'Colorado'),"
-          ."(840, 'CT', 'Connecticut'),"
-          ."(840, 'DE', 'Delaware'),"
-          ."(840, 'DC', 'District of Columbia'),"
-          ."(840, 'FM', 'Federated States Of Micronesia'),"
-          ."(840, 'FL', 'Florida'),"
-          ."(840, 'GA', 'Georgia'),"
-          ."(840, 'GU', 'Guam'),"
-          ."(840, 'HI', 'Hawaii'),"
-          ."(840, 'ID', 'Idaho'),"
-          ."(840, 'IL', 'Illinois'),"
-          ."(840, 'IN', 'Indiana'),"
-          ."(840, 'IA', 'Iowa'),"
-          ."(840, 'KS', 'Kansas'),"
-          ."(840, 'KY', 'Kentucky'),"
-          ."(840, 'LA', 'Louisiana'),"
-          ."(840, 'ME', 'Maine'),"
-          ."(840, 'MH', 'Marshall Islands'),"
-          ."(840, 'MD', 'Maryland'),"
-          ."(840, 'MA', 'Massachusetts'),"
-          ."(840, 'MI', 'Michigan'),"
-          ."(840, 'MN', 'Minnesota'),"
-          ."(840, 'MS', 'Mississippi'),"
-          ."(840, 'MO', 'Missouri'),"
-          ."(840, 'MT', 'Montana'),"
-          ."(840, 'NE', 'Nebraska'),"
-          ."(840, 'NV', 'Nevada'),"
-          ."(840, 'NH', 'New Hampshire'),"
-          ."(840, 'NJ', 'New Jersey'),"
-          ."(840, 'NM', 'New Mexico'),"
-          ."(840, 'NY', 'New York'),"
-          ."(840, 'NC', 'North Carolina'),"
-          ."(840, 'ND', 'North Dakota'),"
-          ."(840, 'MP', 'Northern Mariana Islands'),"
-          ."(840, 'OH', 'Ohio'),"
-          ."(840, 'OK', 'Oklahoma'),"
-          ."(840, 'OR', 'Oregon'),"
-          ."(840, 'PW', 'Palau'),"
-          ."(840, 'PA', 'Pennsylvania'),"
-          ."(840, 'PR', 'Puerto Rico'),"
-          ."(840, 'RI', 'Rhode Island'),"
-          ."(840, 'SC', 'South Carolina'),"
-          ."(840, 'SD', 'South Dakota'),"
-          ."(840, 'TN', 'Tennessee'),"
-          ."(840, 'TX', 'Texas'),"
-          ."(840, 'UT', 'Utah'),"
-          ."(840, 'VT', 'Vermont'),"
-          ."(840, 'VI', 'Virgin Islands'),"
-          ."(840, 'VA', 'Virginia'),"
-          ."(840, 'WA', 'Washington'),"
-          ."(840, 'WV', 'West Virginia'),"
-          ."(840, 'WI', 'Wisconsin'),"
-          ."(840, 'WY', 'Wyoming')");
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
 
   variable_set('uc_address_format_840',
                "!company\r\n!first_name !last_name\r\n!street1\r\n!street2"