Yeah, that FIXME is old and should be taken away.
I fixed this only to be able to remove these fixmes, and then I forgot to remove the fixme comment itself ... :-)