Not that this is changed here, but why the FIXME?