diff --git a/java/ql/lib/semmle/code/java/security/TrustBoundaryViolationQuery.qll b/java/ql/lib/semmle/code/java/security/TrustBoundaryViolationQuery.qll
index 91e9b18cc9b..78589add96d 100644
--- a/java/ql/lib/semmle/code/java/security/TrustBoundaryViolationQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/TrustBoundaryViolationQuery.qll
@@ -31,18 +31,26 @@ private class ExternalTrustBoundaryValidationSanitizer extends TrustBoundaryVali
   ExternalTrustBoundaryValidationSanitizer() { barrierNode(this, "trust-boundary-violation") }
 }
 
+private class SimpleTypeTrustBoundaryValidationSanitizer extends TrustBoundaryValidationSanitizer instanceof SimpleTypeSanitizer
+{ }
+
+private class RegexpCheckTrustBoundaryValidationSanitizer extends TrustBoundaryValidationSanitizer instanceof RegexpCheckBarrier
+{ }
+
+private class HttpServletSessionTypeTrustBoundaryValidationSanitizer extends TrustBoundaryValidationSanitizer
+{
+  HttpServletSessionTypeTrustBoundaryValidationSanitizer() {
+    this.getType() instanceof HttpServletSession
+  }
+}
+
 /**
  * Taint tracking for data that crosses a trust boundary.
  */
 module TrustBoundaryConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) { source instanceof TrustBoundaryViolationSource }
 
-  predicate isBarrier(DataFlow::Node node) {
-    node instanceof TrustBoundaryValidationSanitizer or
-    node.getType() instanceof HttpServletSession or
-    node instanceof SimpleTypeSanitizer or
-    node instanceof RegexpCheckBarrier
-  }
+  predicate isBarrier(DataFlow::Node node) { node instanceof TrustBoundaryValidationSanitizer }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof TrustBoundaryViolationSink }