Merge: cleanup for vc-ignore.