Changes for new Dart version.