Right, I was trawling through a branch without these changes so I misread the code again :/