More hierarchy settings refactoring work. Mostly around affiliations.