These are a few commits I had lying around from investigating #20740. They are waiting for time for performance evaluation.
