Move populate statements for countries and states ahead of addresses.