resolve identifiers earlier to prevent duplicates