Updated to work with new Dart version 0.5.16_r23799 .