diff --git a/search/Search.cc b/search/Search.cc
index 5cf5b636..67eeb453 100644
--- a/search/Search.cc
+++ b/search/Search.cc
@@ -1198,10 +1198,11 @@ Search::arrivalsChanged(Vertex *vertex,
       int arrival_index1;
       arrival_iter1.next(tag1, arrival_index1);
       Arrival &arrival1 = arrivals1[arrival_index1];
+      Tag *tag2;
       Arrival arrival2;
-      bool arrival_exists2;
-      tag_bldr->tagArrival(tag1, arrival2, arrival_exists2);
-      if (!arrival_exists2
+      int arrival_index2;
+      tag_bldr->tagMatchArrival(tag1, tag2, arrival2, arrival_index2);
+      if (tag2 != tag1
 	  || !delayEqual(arrival1, arrival2))
 	return true;
     }
diff --git a/search/TagGroup.cc b/search/TagGroup.cc
index 83015b8a..28233df7 100644
--- a/search/TagGroup.cc
+++ b/search/TagGroup.cc
@@ -162,30 +162,6 @@ TagGroupBldr::reportArrivalEntries() const
   arrivalMapReport(&arrival_map_, sta_);
 }
 
-void
-TagGroupBldr::tagArrival(Tag *tag,
-			 // Return values.
-			 Arrival &arrival,
-			 int &arrival_index,
-			 bool &exists) const
-{
-  arrival_map_.findKey(tag, arrival_index, exists);
-  if (exists)
-    arrival = arrivals_[arrival_index];
-}
-
-void
-TagGroupBldr::tagArrival(Tag *tag,
-			 // Return values.
-			 Arrival &arrival,
-			 bool &exists) const
-{
-  int arrival_index;
-  arrival_map_.findKey(tag, arrival_index, exists);
-  if (exists)
-    arrival = arrivals_[arrival_index];
-}
-
 void
 TagGroupBldr::tagMatchArrival(Tag *tag,
 			      // Return values.
diff --git a/search/TagGroup.hh b/search/TagGroup.hh
index 3b7f0506..b419b464 100644
--- a/search/TagGroup.hh
+++ b/search/TagGroup.hh
@@ -107,15 +107,6 @@ public:
   bool hasFilterTag() const { return has_filter_tag_; }
   bool hasLoopTag() const { return has_loop_tag_; }
   void deleteArrival(Tag *tag);
-  void tagArrival(Tag *tag,
-		  // Return values.
-		  Arrival &arrival,
-		  bool &exists) const;
-  void tagArrival(Tag *tag,
-		  // Return values.
-		  Arrival &arrival,
-		  int &arrival_index,
-		  bool &exists) const;
   void tagMatchArrival(Tag *tag,
 		       // Return values.
 		       Tag *&tag_match,