More ExternalTool refactoring.