Fix address formatting for country-only addresses

Not that we can format much there, but there's also no need to just return the raw country code in that case rather than the localized country name.