Agreed but I think that should be a pull request of its own not part of this one