Update dart code to build under dart 1.5