diff --git a/include/sta/LibertyClass.hh b/include/sta/LibertyClass.hh
index 93d8df60..3b0f4d5b 100644
--- a/include/sta/LibertyClass.hh
+++ b/include/sta/LibertyClass.hh
@@ -136,12 +136,6 @@ enum class TableAxisVariable {
 enum class PathType { clk, data, clk_and_data };
 const int path_type_count = 2;
 
-// Rise/fall to rise/fall.
-const int timing_arc_index_bit_count = 2;
-const int timing_arc_index_max = (1<<timing_arc_index_bit_count)-1;
-const int timing_arc_set_index_bit_count = 18;
-const int timing_arc_set_index_max=(1<<timing_arc_set_index_bit_count)-1;
-
 class LibertyPortNameLess
 {
 public:
diff --git a/liberty/Liberty.cc b/liberty/Liberty.cc
index 6929f8e2..d834210b 100644
--- a/liberty/Liberty.cc
+++ b/liberty/Liberty.cc
@@ -1211,8 +1211,6 @@ unsigned
 LibertyCell::addTimingArcSet(TimingArcSet *arc_set)
 {
   int set_index = timing_arc_sets_.size();
-  if (set_index > timing_arc_set_index_max)
-    criticalError(235, "timing arc set max index exceeded");
   timing_arc_sets_.push_back(arc_set);
 
   LibertyPort *from = arc_set->from();
diff --git a/liberty/TimingArc.cc b/liberty/TimingArc.cc
index 318290d7..4176985e 100644
--- a/liberty/TimingArc.cc
+++ b/liberty/TimingArc.cc
@@ -239,7 +239,8 @@ TimingArcIndex
 TimingArcSet::addTimingArc(TimingArc *arc)
 {
   TimingArcIndex arc_index = arcs_.size();
-  if (arc_index > timing_arc_index_max)
+  // Rise/fall to rise/fall.
+  if (arc_index > RiseFall::index_count * RiseFall::index_count)
     criticalError(243, "timing arc max index exceeded\n");
   arcs_.push_back(arc);
 
diff --git a/search/Tag.cc b/search/Tag.cc
index b29e97f4..e895c730 100644
--- a/search/Tag.cc
+++ b/search/Tag.cc
@@ -97,7 +97,7 @@ Tag::asString(bool report_index,
   string result;
 
   if (report_index)
-    result += std::to_string(index_);
+    result += std::to_string(index_) + " ";
 
   if (report_rf_min_max) {
     const RiseFall *rf = transition();