> Using a tool to refactor is better for source control

Yup, until merges/conflicts. :) Semantic diffs with refactoring operations would solve this.