Merged from github: chirayuk/dart.dart2closure.