Fixed Issue #518: Issue tags updated.
diff --git a/LanguageFeatures/nnbd/exports_A01_functions_t12.dart b/LanguageFeatures/nnbd/exports_A01_functions_t12.dart
index 1b7c553..bc0504e 100644
--- a/LanguageFeatures/nnbd/exports_A01_functions_t12.dart
+++ b/LanguageFeatures/nnbd/exports_A01_functions_t12.dart
@@ -10,6 +10,7 @@
  * @description Check that if generic function with nullable type parameter is
  * exported from opted-in library to legacy library and then back to the opted
  * in code, it retains its status and so can accept [Null] as a type parameter.
+ * @Issue 40399
  * @author iarkh@unipro.ru
  */
 // SharedOptions=--enable-experiment=non-nullable
diff --git a/LanguageFeatures/nnbd/exports_A01_typedef_t13.dart b/LanguageFeatures/nnbd/exports_A01_typedef_t13.dart
index 7023d1c..a7369b5 100644
--- a/LanguageFeatures/nnbd/exports_A01_typedef_t13.dart
+++ b/LanguageFeatures/nnbd/exports_A01_typedef_t13.dart
@@ -20,8 +20,8 @@
 import "../../Utils/expect.dart";
 import "exports_A01_legacy_lib.dart";
 
-typedef exp_int     <T extends int>      = void Function(T);
-typedef exp_object  <T extends Object>   = void Function(T);
+typedef exp_int     <T extends int     > = void Function(T);
+typedef exp_object  <T extends Object  > = void Function(T);
 typedef exp_function<T extends Function> = void Function(T);
 
 main() {
diff --git a/LanguageFeatures/nnbd/override_checking_A01_ARGS_t05.dart b/LanguageFeatures/nnbd/override_checking_A01_ARGS_t05.dart
index 014f4c5..7b0cb26 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_ARGS_t05.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_ARGS_t05.dart
@@ -14,8 +14,6 @@
  * can accept [Null] argument if corresponding parent method argument is of
  * [Never] type.
  *
- * @Issue 39917
- *
  * @author iarkh@unipro.ru
  */
 // SharedOptions=--enable-experiment=non-nullable
diff --git a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t02.dart b/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t02.dart
index c85240e..454628d 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t02.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t02.dart
@@ -15,6 +15,7 @@
  * and child class type parameter can be [Null] even if parent class type
  * parameter is non-nullable.
  *
+ * @OIssue 40398
  * @author iarkh@unipro.ru
  */
 // SharedOptions=--enable-experiment=non-nullable
diff --git a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t09.dart b/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t09.dart
index f4f7dc1..3aee54b 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t09.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t09.dart
@@ -13,7 +13,7 @@
  * @description Check that if legacy class extends opted-in class, child class
  * type parameter can be [Null] if parent class type parameter is [Never].
  *
- * Issue 39917
+ * Issue 40389S
  * @author iarkh@unipro.ru
  */
 // SharedOptions=--enable-experiment=non-nullable
diff --git a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t12.dart b/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t12.dart
index e6c0d46..9f8f748 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t12.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t12.dart
@@ -15,6 +15,7 @@
  * and child class type parameter can be [Null] even if parent class type
  * parameter is non-nullable.
  *
+ * @Issue 40398
  * @author iarkh@unipro.ru
  */
 // SharedOptions=--enable-experiment=non-nullable
diff --git a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t19.dart b/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t19.dart
index 45c1071..a5729d6 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t19.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t19.dart
@@ -13,7 +13,7 @@
  * @description Check that if legacy class implements opted-in class, child
  * class type parameter can be [Null] if parent class type parameter is [Never].
  *
- * Issue 39917
+ * Issue 40389
  * @author iarkh@unipro.ru
  */
 // SharedOptions=--enable-experiment=non-nullable
diff --git a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t22.dart b/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t22.dart
index 7da6dd3..b20dd2c 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t22.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t22.dart
@@ -15,6 +15,7 @@
  * and child class type parameter can be [Null] even if parent class type
  * parameter is non-nullable.
  *
+ * @Issue 40398
  * @author iarkh@unipro.ru
  */
 // SharedOptions=--enable-experiment=non-nullable
diff --git a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t29.dart b/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t29.dart
index e147251..2e6b347 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t29.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_CLASSPARAM_t29.dart
@@ -13,7 +13,7 @@
  * @description Check that if legacy class is a mixin with opted-in class, child
  * class type parameter can be [Null] if parent class type parameter is [Never].
  *
- * Issue 39917
+ * Issue 40389
  * @author iarkh@unipro.ru
  */
 // SharedOptions=--enable-experiment=non-nullable
diff --git a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t19.dart b/LanguageFeatures/nnbd/override_checking_A01_FIELD_t19.dart
index f8cca08..e009ab1 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t19.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_FIELD_t19.dart
@@ -13,7 +13,7 @@
  * @description Check that if legacy class extends opted-in class, legacy field
  * can be [Null] if corresponding parent field is of the type [Never].
  *
- * @Issue 39917
+ * @Issue 40389
  *
  * @author iarkh@unipro.ru
  */
diff --git a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t21.dart b/LanguageFeatures/nnbd/override_checking_A01_FIELD_t21.dart
index 3780eb9..fc4b5e3 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t21.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_FIELD_t21.dart
@@ -13,7 +13,7 @@
  * @description Check that if legacy class implements opted-in class, legacy
  * field can be [Null] if corresponding parent field is of the type [Never].
  *
- * @Issue 39917
+ * @Issue 40389
  *
  * @author iarkh@unipro.ru
  */
diff --git a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t23.dart b/LanguageFeatures/nnbd/override_checking_A01_FIELD_t23.dart
index a843650..8490a78 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_FIELD_t23.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_FIELD_t23.dart
@@ -14,7 +14,7 @@
  * legacy field can be [Null] if corresponding parent field is of the type
  * [Never].
  *
- * @Issue 39917
+ * @Issue 40389
  *
  * @author iarkh@unipro.ru
  */
diff --git a/LanguageFeatures/nnbd/override_checking_A01_GETTER_t05.dart b/LanguageFeatures/nnbd/override_checking_A01_GETTER_t05.dart
index dd5fe97..19d5386 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_GETTER_t05.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_GETTER_t05.dart
@@ -13,7 +13,7 @@
  * @description Check that if legacy class extends opted-in class, legacy getter
  * can return [null] if corresponding parent getter is of the type [Never].
  *
- * @Issue 39917
+ * @Issue 40389
  *
  * @author iarkh@unipro.ru
  */
diff --git a/LanguageFeatures/nnbd/override_checking_A01_GETTER_t11.dart b/LanguageFeatures/nnbd/override_checking_A01_GETTER_t11.dart
index fdfec53..2acf68d 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_GETTER_t11.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_GETTER_t11.dart
@@ -14,7 +14,7 @@
  * getter can return [null] if corresponding parent getter is of the type
  * [Never].
  *
- * @Issue 39917
+ * @Issue 40389
  *
  * @author iarkh@unipro.ru
  */
diff --git a/LanguageFeatures/nnbd/override_checking_A01_GETTER_t17.dart b/LanguageFeatures/nnbd/override_checking_A01_GETTER_t17.dart
index bc7138e..1bbbbae 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_GETTER_t17.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_GETTER_t17.dart
@@ -14,7 +14,7 @@
  * legacy getter can return [null] if corresponding parent getter is of the type
  * [Never].
  *
- * @Issue 39917
+ * @Issue 40389
  *
  * @author iarkh@unipro.ru
  */
diff --git a/LanguageFeatures/nnbd/override_checking_A01_RETURN_t05.dart b/LanguageFeatures/nnbd/override_checking_A01_RETURN_t05.dart
index 3c7eac4..a75c86b 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_RETURN_t05.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_RETURN_t05.dart
@@ -13,7 +13,7 @@
  * @description Check that if legacy class extends opted-in class, legacy method
  * can return [null] if parent method return type is [Never].
  *
- * @Issue 39917
+ * @Issue 40389
  *
  * @author iarkh@unipro.ru
  */
diff --git a/LanguageFeatures/nnbd/override_checking_A01_RETURN_t11.dart b/LanguageFeatures/nnbd/override_checking_A01_RETURN_t11.dart
index e985678..e8e45d4 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_RETURN_t11.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_RETURN_t11.dart
@@ -13,7 +13,7 @@
  * @description Check that if legacy class implements opted-in class, legacy
  * method can return [null] if parent method return type is [Never].
 
- * @Issue 39917
+ * @Issue 40389
  *
  * @author iarkh@unipro.ru
  */
diff --git a/LanguageFeatures/nnbd/override_checking_A01_RETURN_t17.dart b/LanguageFeatures/nnbd/override_checking_A01_RETURN_t17.dart
index 3ba41aa..3d2eecf 100644
--- a/LanguageFeatures/nnbd/override_checking_A01_RETURN_t17.dart
+++ b/LanguageFeatures/nnbd/override_checking_A01_RETURN_t17.dart
@@ -13,7 +13,7 @@
  * @description Check that if legacy class is a mixin with opted-in class,
  * legacy method can return [null] if parent method return type is [Never].
  *
- * @Issue 39917
+ * @Issue 40389
  *
  * @author iarkh@unipro.ru
  */