We should do this as part of another change, if you like, create an issue and assign me to it.