Handle rebase cases more properly