Describe diff:trunk/trac@3538//sandbox/vc-refactoring/trac@3539 here.