I've taken care of this in the other PR, and I will rebase off that when we've worked it into something we want to use :)