Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Overlaps with some other PRs of yours I think.

Yeah, this stacks on top of the other PR - I can split it out if you prefer, though the commits are already separate and I'll be merging them in order anyway after rebasing.