More fallout from rebase.