OK thanks. I'll put that on my list of refactorings. This PR is already too big to deal with that.