Update code to recent Dart

No warnings or errors on 16761