GeezerVison

I'm starting to feel like a frog being slowly boiled. I'm seeing repeated optimizations like this being handled piecemeal, and each time I do, I need to go through the same process: point out that there's a systemic problem that has no solution, ensure there's a comment protecting the change and linking to the motivation, then merge and roll out the change. </rant>

Looks good. I'll add the comment linking back to the motivation and analysis (here). Thanks for the contrib.