Rebase continues, down to one FIXME