Tidy up imports/Dart2js warnings.