Given this was already what we were doing, fixing/changing that is a separate issue.  I'm going to merge, but if you're still concerned, open an issue and we can solve it separately.