tree_converter: another attempt to get rid of "Gaza Strip Strip" and "Ehud Barak Barak"; still not quite there