Adapt to recent changes of DART (refactoring).