Address review comments

Author: hvitved

csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowPrivate.qll

@@ -2102,24 +2102,6 @@ private predicate uselessTypebound(DataFlowType dt) {
     )
 }
 
-pragma[nomagic]
-private predicate typeStrongerThanNonDelegate(DataFlowType t1, DataFlowType t2) {
-  t1 != t2 and
-  t1.asGvnType() = getANonTypeParameterSubTypeRestricted(t2.asGvnType())
-  or
-  t1.asGvnType() instanceof RelevantGvnType and
-  not uselessTypebound(t1) and
-  uselessTypebound(t2)
-}
-
-bindingset[t1, t2]
-predicate typeStrongerThan(DataFlowType t1, DataFlowType t2) {
-  typeStrongerThanNonDelegate(t1, t2)
-  or
-  exists(t1.asDelegate()) and
-  t1 != t2
-}
-
 pragma[inline]
 private predicate compatibleTypesDelegateLeft(DataFlowType dt1, DataFlowType dt2) {
   exists(Gvn::GvnType t1, Gvn::GvnType t2 |
@@ -2176,6 +2158,18 @@ predicate compatibleTypes(DataFlowType dt1, DataFlowType dt2) {
   dt1.asDelegate() = dt2.asDelegate()
 }
 
+pragma[nomagic]
+predicate typeStrongerThan(DataFlowType t1, DataFlowType t2) {
+  t1 != t2 and
+  t1.asGvnType() = getANonTypeParameterSubTypeRestricted(t2.asGvnType())
+  or
+  t1.asGvnType() instanceof RelevantGvnType and
+  not uselessTypebound(t1) and
+  uselessTypebound(t2)
+  or
+  compatibleTypesDelegateLeft(t1, t2)
+}
+
 /**
  * A node associated with an object after an operation that might have
  * changed its state.

csharp/ql/test/library-tests/dataflow/typeflow-dispatch/TypeFlowDispatch.cs

@@ -8,11 +8,6 @@ public class A
 
     public static void Sink<T>(T t) { }
 
-    interface MyConsumer
-    {
-        void run(Object o);
-    }
-
     static void Apply1<T>(Action<T> f, T x)
     {
         f(x);