More refactoring to support multiple demes from the same exemplar