Merge branch 'main' into nullterm2

cpp/ql/test/library-tests/access/noPublic/noPublic.ql

@@ -3,5 +3,5 @@ import cpp
 from AccessSpecifier spec
 // There is no way to create "protected" access without writing the keyword
 // `protected` in the source, so we don't need to test for that.
-where spec.hasName("private") or spec.hasName("public")
+where spec.hasName(["private", "public"])
 select spec

cpp/ql/test/library-tests/ir/points_to/points_to.ql

@@ -3,12 +3,7 @@ private import TestUtilities.InlineExpectationsTest
 private import semmle.code.cpp.ir.internal.IntegerConstant as Ints
 
 private predicate ignoreAllocation(string name) {
-  name = "i" or
-  name = "p" or
-  name = "q" or
-  name = "s" or
-  name = "t" or
-  name = "?{AllAliased}"
+  name = ["i", "p", "q", "s", "t", "?{AllAliased}"]
 }
 
 private predicate ignoreFile(File file) {