This makes the code more consistent but also fixes our flutter-analyze bot.

Issue https://github.com/dart-lang/sdk/issues/35940