Allow string manipulation of country names.

Although, glancing at this again possibly I shouldn't have removed the toUpperCase?

That aside, an approach you're happy with?