rebase -i: several cleanups