If you are so inclined, I'd merge this in its own PR for sure.