diff --git a/gulpfile.js b/gulpfile.js
index 0def90d722..cfc098a386 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -344,11 +344,21 @@ gulp.task('build/transpile.dart', transpile(gulp, gulpPlugins, {
 
 var ts2dart = require('gulp-ts2dart');
 gulp.task('build/transpile.dart.ts2dart', function() {
-  gulp.src('modules/angular2/src/di/*.js')
+  gulp.src(['modules/angular2/src/di/*.js', 'modules/angular2/test/di/*.js', 'modules/angular2/src/test_lib/*.js'])
       .pipe(ts2dart.transpile())
-      .pipe(ts2dart.format())
       .pipe(gulp.dest('dist/dart.ts2dart'))
 });
+gulp.task('build/format.dart.ts2dart', rundartpackage(gulp, gulpPlugins, {
+  pub: DART_SDK.PUB,
+  packageName: CONFIG.formatDart.packageName,
+  args: ['dart_style:format', '-w', 'dist/dart.ts2dart']
+}));
+gulp.task('ts2dart', function(done) {
+  runSequence(
+    ['build/transpile.dart.ts2dart', 'build/format.dart.ts2dart'],
+    done
+  );
+});
 
 // ------------
 // html
diff --git a/modules/angular2/src/di/injector.js b/modules/angular2/src/di/injector.js
index 3807abfabe..e76ee671cf 100644
--- a/modules/angular2/src/di/injector.js
+++ b/modules/angular2/src/di/injector.js
@@ -27,7 +27,7 @@ export class Injector {
   _defaultBindings:boolean;
   _asyncStrategy: _AsyncInjectorStrategy;
   _syncStrategy:_SyncInjectorStrategy;
-  constructor(bindings:List, {parent=null, defaultBindings=false}={}) {
+  constructor(bindings:List, parent=null, defaultBindings=false) {
     var flatten = _flattenBindings(bindings, MapWrapper.create());
     this._bindings = this._createListOfBindings(flatten);
     this._instances = this._createInstances();