diff --git a/spectator/CMakeLists.txt b/spectator/CMakeLists.txt
index 32028c9..dd89c71 100644
--- a/spectator/CMakeLists.txt
+++ b/spectator/CMakeLists.txt
@@ -19,7 +19,6 @@ add_library(spectator OBJECT
     "config.h"
     "counter.cc"
     "counter.h"
-    "detail/perc_policy.h"
     "dist_stats.h"
     "dist_summary.cc"
     "dist_summary.h"
diff --git a/spectator/detail/perc_policy.h b/spectator/detail/perc_policy.h
deleted file mode 100644
index 9bd43ca..0000000
--- a/spectator/detail/perc_policy.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#pragma once
-
-#include "../percentile_buckets.h"
-#include "../registry.h"
-#include <array>
-
-namespace spectator::detail {
-
-#include "../percentile_bucket_tags.inc"
-
-using counters_t =
-    std::array<std::shared_ptr<Counter>, PercentileBucketsLength()>;
-
-struct lazy_policy {
-  static void init(Registry* /* r */, const Id& /* id */,
-                   counters_t* /* counters */,
-                   const std::string* /* perc_tags */) {}
-  static auto get_counter(Registry* r, const Id& id,
-                                              counters_t* counters,
-                                              size_t index,
-                                              const std::string* perc_tags) -> std::shared_ptr<Counter> {
-    using spectator::refs;
-    auto& c = counters->at(index);
-    if (!c) {
-      auto counterId =
-          id.WithTags(refs().statistic(), refs().percentile(),
-              refs().percentile(), intern_str(perc_tags[index]));
-      counters->at(index) = r->GetCounter(std::move(counterId));
-      c = counters->at(index);
-    }
-    return c;
-  }
-};
-
-}  // namespace spectator::detail
\ No newline at end of file
diff --git a/spectator/perc_dist_summary_test.cc b/spectator/perc_dist_summary_test.cc
index 8b18122..5c6faf7 100644
--- a/spectator/perc_dist_summary_test.cc
+++ b/spectator/perc_dist_summary_test.cc
@@ -39,20 +39,6 @@ class PercentileDistributionSummaryTest : public ::testing::Test {
 
 TYPED_TEST_SUITE(PercentileDistributionSummaryTest, Implementations, NameGenerator);
 
-TYPED_TEST(PercentileDistributionSummaryTest, Percentile) {
-  auto& ds = this->ds;
-
-  for (auto i = 0; i < 100000; ++i) {
-    ds->Record(i);
-  }
-
-  for (auto i = 0; i <= 100; ++i) {
-    auto expected = 1e3 * i;
-    auto threshold = 0.15 * expected;
-    EXPECT_NEAR(expected, ds->Percentile(i), threshold);
-  }
-}
-
 TYPED_TEST(PercentileDistributionSummaryTest, Measure) {
   this->ds->Record(42);
 
diff --git a/spectator/perc_timer_test.cc b/spectator/perc_timer_test.cc
index 222e01d..270635b 100644
--- a/spectator/perc_timer_test.cc
+++ b/spectator/perc_timer_test.cc
@@ -39,18 +39,6 @@ class PercentileTimerTest : public ::testing::Test {
 
 TYPED_TEST_SUITE(PercentileTimerTest, Implementations, NameGenerator);
 
-TYPED_TEST(PercentileTimerTest, Percentile) {
-  for (auto i = 0; i < 100000; ++i) {
-    this->timer->Record(absl::Milliseconds(i));
-  }
-
-  for (auto i = 0; i <= 100; ++i) {
-    auto expected = static_cast<double>(i);
-    auto threshold = 0.15 * expected;
-    EXPECT_NEAR(expected, this->timer->Percentile(i), threshold);
-  }
-}
-
 TYPED_TEST(PercentileTimerTest, Measure) {
   auto elapsed = absl::Milliseconds(42);
   this->timer->Record(elapsed);
diff --git a/spectator/percentile_buckets.cc b/spectator/percentile_buckets.cc
index 39cd953..573a6cc 100644
--- a/spectator/percentile_buckets.cc
+++ b/spectator/percentile_buckets.cc
@@ -1,10 +1,8 @@
+#include "percentile_bucket_values.inc"
 #include "percentile_buckets.h"
-#include <limits>
 
 namespace spectator {
 
-#include "percentile_bucket_values.inc"
-
 auto GetPercBucketValue(size_t i) -> int64_t { return kBucketValues.at(i); }
 
 auto PercentileBucketIndexOf(int64_t v) -> size_t {
diff --git a/spectator/percentile_distribution_summary.h b/spectator/percentile_distribution_summary.h
index 6cee7e6..253ddb5 100644
--- a/spectator/percentile_distribution_summary.h
+++ b/spectator/percentile_distribution_summary.h
@@ -1,24 +1,28 @@
 #pragma once
 
-#include "detail/perc_policy.h"
 #include "id.h"
+#include "percentile_bucket_tags.inc"
 #include "percentile_buckets.h"
 #include "registry.h"
 #include "util.h"
 
 namespace spectator {
 
-template <typename policy>
-class percentile_distribution_summary {
+class PercentileDistributionSummary {
  public:
-  percentile_distribution_summary(Registry* registry, Id id, int64_t min,
-                                  int64_t max) noexcept
+  PercentileDistributionSummary(Registry* registry, Id id, int64_t min, int64_t max) noexcept
       : registry_{registry},
         id_{std::move(id)},
         min_{min},
         max_{max},
         dist_summary_{registry->GetDistributionSummary(id_)} {
-    policy::init(registry_, id_, &counters_, detail::kDistTags.begin());
+  }
+
+  auto get_counter(size_t index, const std::string* perc_tags) -> std::shared_ptr<Counter> {
+    using spectator::refs;
+    auto counterId = id_.WithTags(refs().statistic(), refs().percentile(), refs().percentile(),
+                                  intern_str(perc_tags[index]));
+    return registry_->GetCounter(std::move(counterId));
   }
 
   void Record(int64_t amount) noexcept {
@@ -29,26 +33,13 @@ class percentile_distribution_summary {
     dist_summary_->Record(amount);
     auto restricted = restrict(amount, min_, max_);
     auto index = PercentileBucketIndexOf(restricted);
-    auto c = policy::get_counter(registry_, id_, &counters_, index,
-                                 detail::kDistTags.begin());
+    auto c = get_counter(index, kDistTags.begin());
     c->Increment();
   }
 
   auto MeterId() const noexcept -> const Id& { return id_; }
   auto Count() const noexcept -> int64_t { return dist_summary_->Count(); }
-  auto TotalAmount() const noexcept -> double {
-    return dist_summary_->TotalAmount();
-  }
-  auto Percentile(double p) const noexcept -> double {
-    std::array<int64_t, PercentileBucketsLength()> counts{};
-    for (size_t i = 0; i < PercentileBucketsLength(); ++i) {
-      auto& c = counters_.at(i);
-      if (c) {
-        counts.at(i) = static_cast<int64_t>(c->Count());
-      }
-    }
-    return spectator::Percentile(counts, p);
-  }
+  auto TotalAmount() const noexcept -> double { return dist_summary_->TotalAmount(); }
 
  private:
   Registry* registry_;
@@ -56,10 +47,6 @@ class percentile_distribution_summary {
   int64_t min_;
   int64_t max_;
   std::shared_ptr<DistributionSummary> dist_summary_;
-  mutable detail::counters_t counters_{};
 };
 
-using PercentileDistributionSummary =
-    percentile_distribution_summary<detail::lazy_policy>;
-
 }  // namespace spectator
diff --git a/spectator/percentile_timer.h b/spectator/percentile_timer.h
index 697d907..7a023b0 100644
--- a/spectator/percentile_timer.h
+++ b/spectator/percentile_timer.h
@@ -1,53 +1,41 @@
 #pragma once
 
-#include "detail/perc_policy.h"
 #include "id.h"
+#include "percentile_bucket_tags.inc"
 #include "percentile_buckets.h"
 #include "registry.h"
 #include "util.h"
 
 namespace spectator {
 
-template <typename policy>
-class percentile_timer {
+class PercentileTimer {
  public:
-  percentile_timer(Registry* registry, Id id, absl::Duration min,
-                   absl::Duration max) noexcept
+  PercentileTimer(Registry* registry, Id id, absl::Duration min, absl::Duration max) noexcept
       : registry_{registry},
         id_{std::move(id)},
         min_{min},
         max_{max},
-        timer_{registry->GetTimer(id_)} {
-    policy::init(registry_, id_, &counters_, detail::kTimerTags.begin());
+        timer_{registry->GetTimer(id_)} {}
+
+  auto get_counter(size_t index, const std::string* perc_tags) -> std::shared_ptr<Counter> {
+    using spectator::refs;
+    auto counterId = id_.WithTags(refs().statistic(), refs().percentile(), refs().percentile(),
+                                  intern_str(perc_tags[index]));
+    return registry_->GetCounter(std::move(counterId));
   }
 
   void Record(absl::Duration amount) noexcept {
     timer_->Record(amount);
     auto restricted = restrict(amount, min_, max_);
     auto index = PercentileBucketIndexOf(absl::ToInt64Nanoseconds(restricted));
-    auto c = policy::get_counter(registry_, id_, &counters_, index,
-                                 detail::kTimerTags.begin());
+    auto c = get_counter(index, kTimerTags.begin());
     c->Increment();
   }
 
-  void Record(std::chrono::nanoseconds amount) noexcept {
-    Record(absl::FromChrono(amount));
-  }
-
+  void Record(std::chrono::nanoseconds amount) noexcept { Record(absl::FromChrono(amount)); }
   auto MeterId() const noexcept -> const Id& { return id_; }
   auto Count() const noexcept -> int64_t { return timer_->Count(); }
   auto TotalTime() const noexcept -> int64_t { return timer_->TotalTime(); }
-  auto Percentile(double p) const noexcept -> double {
-    std::array<int64_t, PercentileBucketsLength()> counts{};
-    for (size_t i = 0; i < PercentileBucketsLength(); ++i) {
-      auto& c = counters_.at(i);
-      if (c) {
-        counts.at(i) = c->Count();
-      }
-    }
-    auto v = spectator::Percentile(counts, p);
-    return v / 1e9;
-  };
 
  private:
   Registry* registry_;
@@ -55,9 +43,6 @@ class percentile_timer {
   absl::Duration min_;
   absl::Duration max_;
   std::shared_ptr<Timer> timer_;
-  mutable detail::counters_t counters_{};
 };
 
-using PercentileTimer = percentile_timer<detail::lazy_policy>;
-
 }  // namespace spectator
diff --git a/tools/gen_perc_bucket_tags.cc b/tools/gen_perc_bucket_tags.cc
index 7eba4aa..fa718ba 100644
--- a/tools/gen_perc_bucket_tags.cc
+++ b/tools/gen_perc_bucket_tags.cc
@@ -29,6 +29,12 @@ int main(int argc, char* argv[]) {
     of.open("/dev/stdout");
   }
 
+  of << "#pragma once\n\n"
+     << "namespace spectator {\n\n";
+
   output_array(of, 276, 'T', "kTimerTags");
+  of << "\n";
   output_array(of, 276, 'D', "kDistTags");
+
+  of << "\n}  // namespace spectator\n";
 }
diff --git a/tools/gen_perc_bucket_values.cc b/tools/gen_perc_bucket_values.cc
index 58981b6..d1e0353 100644
--- a/tools/gen_perc_bucket_values.cc
+++ b/tools/gen_perc_bucket_values.cc
@@ -1,5 +1,5 @@
-#include <fstream>
 #include <limits>
+#include <fstream>
 #include <vector>
 
 // Number of positions of base-2 digits to shift when iterating over the long
@@ -39,9 +39,14 @@ int main(int argc, char* argv[]) {
   } else {
     of.open("/dev/stdout");
   }
-  of << "// Do not modify - auto-generated\n//\n"
+
+  of << "#pragma once\n\n"
+     << "#include <array>\n"
+     << "#include <cstddef>\n"
+     << "#include <cstdint>\n\n"
+     << "namespace spectator {\n\n"
      << "static constexpr std::array<int64_t, " << bucketValues.size()
-     << "> kBucketValues = {{";
+     << "> kBucketValues = {{\n";
   bool first = true;
   for (auto v : bucketValues) {
     if (!first) {
@@ -51,7 +56,7 @@ int main(int argc, char* argv[]) {
     }
     of << "  " << v << "LL";
   }
-  of << "}};\n";
+  of << "}};\n\n";
 
   of << "static constexpr std::array<size_t, " << powerOf4Index.size()
      << "> kPowerOf4Index = {{\n";
@@ -64,5 +69,6 @@ int main(int argc, char* argv[]) {
     }
     of << "  " << v << "u";
   }
-  of << "\n}};\n";
+  of << "\n}};\n"
+     << "\n}  // namespace spectator\n";
 }