Again, I'd prefer to save that as a refactoring after a couple of my PRs land -- hit it all at once instead of creating merge conflicts.