Closes #22277 - it's superseded; I have some WIP on evaluation performance, but best do that in a separate PR/thread.