Refactoring some of the CE geopolitical label methods, see comments inline.