Split into individual PRs, which works better for how a lot of companies do code review.