Merge "Small refactoring for FileSynthesisCallback."