Update to support Dart v0.8.7