Protip: If you're chaining PRs, try to keep their concerns as small as possible. These big sweeping PRs are a bit of a pain to review, especially when you hit things like this that are "cleaned up in another PR".