 }
 
 @inline(never)
-public func run_ReplaceSmallBuffer(_ N: Int) {
-  let data = sampleData(.medium)
-  let replacement = sampleData(.small)
-  let sz = replacement.count
-  replacement.withUnsafeBytes { (ptr: UnsafePointer<UInt8>) in
-    benchmark_ReplaceBuffer(N, 431..<809, data, UnsafeBufferPointer(start: ptr, count: sz))
-  }
-}
-
-@inline(never)
-public func run_ReplaceMediumBuffer(_ N: Int) {
-  let data = sampleData(.medium)
-  let replacement = sampleData(.medium)
-  let sz = replacement.count
-  replacement.withUnsafeBytes { (ptr: UnsafePointer<UInt8>) in
-    benchmark_ReplaceBuffer(N, 431..<809, data, UnsafeBufferPointer(start: ptr, count: sz))
-  }
-}
-
-@inline(never)
-public func run_ReplaceLargeBuffer(_ N: Int) {
-  let data = sampleData(.medium)
-  let replacement = sampleData(.large)
-  let sz = replacement.count
-  replacement.withUnsafeBytes { (ptr: UnsafePointer<UInt8>) in
-    benchmark_ReplaceBuffer(N, 431..<809, data, UnsafeBufferPointer(start: ptr, count: sz))
-  }
-}
-
-@inline(never)
 public func run_DataToStringEmpty(_ N: Int) {
   let d = Data()
   for _ in 0..<200 * N {

import Foundation

let d: [BenchmarkCategory] =  [.validation, .api, .Data]
let skip: [BenchmarkCategory] = [.validation, .api, .Data, .skip]

public let DataBenchmarks = [
  BenchmarkInfo(name: "DataCreateEmpty",

  BenchmarkInfo(name: "DataReplaceLarge", runFunction: {
    replace($0, data: medium, subrange:431..<809, with: large) }, tags: d),

  BenchmarkInfo(name: "DataReplaceSmallBuffer", runFunction: {
    replaceBuffer($0, data: medium, subrange:431..<809, with: small) },
    tags: d),
  BenchmarkInfo(name: "DataReplaceMediumBuffer", runFunction: {
    replaceBuffer($0, data: medium, subrange:431..<809, with: medium) },
    tags: d),
  BenchmarkInfo(name: "DataReplaceLargeBuffer", runFunction: {
    replaceBuffer($0, data: medium, subrange:431..<809, with: large) },
    tags: d),

  BenchmarkInfo(name: "DataAppendSequence",
    runFunction: { append($0, sequenceLength: 809, to: medium) }, tags: d),
