Created attachment 44938 [details] like so Unless I'm missing something, we can remove the attached code, we don't seem to use the results of the operations caolanm->noelp: appears to be your commits originally, is the attached reasonable ?
I meant to assign this to noel. Discussed it earlier, and done now.