Disambiguate all instances of the same character with different Ids
Move CharacterId out of control file into separate CharacterIdMap