Resolve a newly-introduced ambiguity

Also fix a simple redundancy noticed while debugging

Author: smowton

java/ql/lib/semmle/code/java/Type.qll

@@ -839,7 +839,7 @@ class LocalClass extends LocalClassOrInterface, NestedClass {
 class TopLevelType extends RefType {
   TopLevelType() {
     not enclInReftype(this, _) and
-    (this instanceof Class or this instanceof Interface)
+    this instanceof ClassOrInterface
   }
 }
 

java/ql/src/utils/stub-generator/Stubs.qll

@@ -515,7 +515,7 @@ private RefType getAReferencedType(RefType t) {
 
 /** A top level type whose file should be stubbed */
 class GeneratedTopLevel extends TopLevelType instanceof GeneratedType {
-  GeneratedTopLevel() { this = this.getSourceDeclaration() }
+  GeneratedTopLevel() { this = this.(ClassOrInterface).getSourceDeclaration() }
 
   private TopLevelType getAnImportedType() {
     result = getAReferencedType(this).getSourceDeclaration() and