The changes are various enough, I think it would be preferable to make one PR each.

—
Reply to this email directly or view it on GitHub.