Adjust change of dart (refactoring branch).