Actually make the country/city geoip distinction work.

The geoip dict always has a city entry, it might just be `None`.