Oh indeed, I had forgotten about that! I think for now I'll leave it as a FIXME, it shouldn't be too serious (as you commented below).