Fix #322328, original patch by AdAstra, rerolled by chx, rewritten to fix the root cause by me: Fix country_name and province_name tokens.