Reverted back to faster pre-refactor. File size was smaller, but benchmarks were slower. :-(