Fixing issue where tokens could stay the same but identifiers could change.