Remove remaining references to iso_3166_alpha_{2,3} fields