This is a pure refactoring, no change in behavior yet. We'll add another field to the struct in the next commit.