It doesn't seem to be a big movement... I'd suggest to do in this PR. I could try to do it, if you want.