git-svn: cleanup: move process_rm around