Chris - this is what I meant by my comment on your PR

Please feel free to squash this in with your changes.