Fix previous two commits, again.

Move --rebase to the front.