VCS: patch creation separated from patch application, small cleanup