Country codes

Better support for country codes.
Maybe this should be a `WARN` level?