Agreed, however as it is not pertinent to this pull request, and to save a rebase of the chained PR's, I'll put it in a future PR.