@ChrisLundquist it seems like an unnecessary change. Yes, I'm aware the code already exists in master, but the change does not modify anything in the codebase; it only adds an additional layer of indirection. I would prefer you leave it as-is, or at least modify it in a different PR. You did it in a separate commit, so you should be able to revert, rebase, and then cherry-pick it out. I'm not seeing why the code needs to be moved into a separate file in this PR, unless I'm missing something.