@rebase: more rewriting