Fix some discrepancies in country names.
Refactor to make it a bit easier to write up the analysis without
fitting the models that we've already discarded.