Data cleanup; improved data quality by removing special cases.

Both "adjective" and "nameForCitizen" should now always be a single useable value (if present). This makes it much easier to use the data safely in a range of contexts.