Simpler rebasing