Further refactoring to more loosely couple language change process.