no-re benchmarks and testing
optimizations
cleanups
Clean up and swap to non-regex impl
Merge branch 'no-regex'

* no-regex:
  Clean up and swap to non-regex impl
  cleanups
  optimizations
  no-re benchmarks and testing