And have proper benchmarks.

---------

Co-authored-by: eskimor <[email protected]>
Co-authored-by: command-bot <>
Co-authored-by: joe petrowski <[email protected]>