Refactoring FileDiff code.
More FileDiff refactoring.
FileDiff refactoring.