To ensure that this remains reusable, we probably should pick a more general name for it and split it out into a separate commit.