Code simplification / Idiomatic dart
Merge branch 'code/simplify' of git://github.com/vicb/di.dart into vicb-code/simplify