Merge "benchmarks: Minor cleanup for strtr benchmark"