Yes, do move, I suggested that in the initial pull request for the `Variables` stuff too I think...