Brought up to Dart 0.4.1 compatibility