Remove fixme for one of the less dubious bits