diff --git a/javascript/ql/src/AlertSuppression.ql b/javascript/ql/src/AlertSuppression.ql
index ca75fc52bd7b..9bd6bbbf8c1e 100644
--- a/javascript/ql/src/AlertSuppression.ql
+++ b/javascript/ql/src/AlertSuppression.ql
@@ -12,80 +12,70 @@ import javascript
  */
 class SuppressionComment extends Locatable {
   string text;
+
   string annotation;
 
   SuppressionComment() {
     (
-     text = this.(LineComment).getText() or
-     text = this.(HTML::CommentNode).getText()
-    )
-    and
+      text = this.(LineComment).getText() or
+      text = this.(HTML::CommentNode).getText()
+    ) and
     (
-     // match `lgtm[...]` anywhere in the comment
-     annotation = text.regexpFind("(?i)\\blgtm\\s*\\[[^\\]]*\\]", _, _)
-     or
-     // match `lgtm` at the start of the comment and after semicolon
-     annotation = text.regexpFind("(?i)(?<=^|;)\\s*lgtm(?!\\B|\\s*\\[)", _, _).trim()
+      // match `lgtm[...]` anywhere in the comment
+      annotation = text.regexpFind("(?i)\\blgtm\\s*\\[[^\\]]*\\]", _, _)
+      or
+      // match `lgtm` at the start of the comment and after semicolon
+      annotation = text.regexpFind("(?i)(?<=^|;)\\s*lgtm(?!\\B|\\s*\\[)", _, _).trim()
     )
   }
 
   /** Gets the text of this suppression comment, not including delimiters. */
-  string getText() {
-    result = text
-  }
+  string getText() { result = text }
 
   /** Gets the suppression annotation in this comment. */
-  string getAnnotation() {
-    result = annotation
-  }
+  string getAnnotation() { result = annotation }
 
   /**
-  * Holds if this comment applies to the range from column `startcolumn` of line `startline`
-  * to column `endcolumn` of line `endline` in file `filepath`.
-  */
+   * Holds if this comment applies to the range from column `startcolumn` of line `startline`
+   * to column `endcolumn` of line `endline` in file `filepath`.
+   */
   predicate covers(string filepath, int startline, int startcolumn, int endline, int endcolumn) {
     this.getLocation().hasLocationInfo(filepath, startline, _, endline, endcolumn) and
     startcolumn = 1
   }
 
   /** Gets the scope of this suppression. */
-  SuppressionScope getScope() {
-    this = result.getSuppressionComment()
-  }
+  SuppressionScope getScope() { this = result.getSuppressionComment() }
 }
 
 /**
  * The scope of an alert suppression comment.
  */
 class SuppressionScope extends @locatable {
-  SuppressionScope() {
-    this instanceof SuppressionComment
-  }
+  SuppressionScope() { this instanceof SuppressionComment }
 
   /** Gets a suppression comment with this scope. */
-  SuppressionComment getSuppressionComment() {
-    result = this
-  }
+  SuppressionComment getSuppressionComment() { result = this }
 
   /**
-  * Holds if this element is at the specified location.
-  * The location spans column `startcolumn` of line `startline` to
-  * column `endcolumn` of line `endline` in file `filepath`.
-  * For more information, see
-  * [LGTM locations](https://lgtm.com/help/ql/locations).
-  */
-  predicate hasLocationInfo(string filepath, int startline, int startcolumn, int endline, int endcolumn) {
+   * Holds if this element is at the specified location.
+   * The location spans column `startcolumn` of line `startline` to
+   * column `endcolumn` of line `endline` in file `filepath`.
+   * For more information, see
+   * [LGTM locations](https://lgtm.com/help/ql/locations).
+   */
+  predicate hasLocationInfo(
+    string filepath, int startline, int startcolumn, int endline, int endcolumn
+  ) {
     this.(SuppressionComment).covers(filepath, startline, startcolumn, endline, endcolumn)
   }
 
   /** Gets a textual representation of this element. */
-  string toString() {
-    result = "suppression range"
-  }
+  string toString() { result = "suppression range" }
 }
 
 from SuppressionComment c
-select c,                 // suppression comment
-       c.getText(),       // text of suppression comment (excluding delimiters)
-       c.getAnnotation(), // text of suppression annotation
-       c.getScope()       // scope of suppression
+select c, // suppression comment
+  c.getText(), // text of suppression comment (excluding delimiters)
+  c.getAnnotation(), // text of suppression annotation
+  c.getScope() // scope of suppression
diff --git a/javascript/ql/src/AngularJS/DeadAngularJSEventListener.ql b/javascript/ql/src/AngularJS/DeadAngularJSEventListener.ql
index 4ae4ba7e8534..54ec854bae4a 100644
--- a/javascript/ql/src/AngularJS/DeadAngularJSEventListener.ql
+++ b/javascript/ql/src/AngularJS/DeadAngularJSEventListener.ql
@@ -17,14 +17,11 @@ import javascript
 predicate isABuiltinEventName(string name) {
   // $rootScope.Scope
   name = "$destroy" or
-
   // $location
   name = "$locationChangeStart" or
   name = "$locationChangeSuccess" or
-
   // ngView
   name = "$viewContentLoaded" or
-
   // angular-ui/ui-router
   name = "$stateChangeStart" or
   name = "$stateNotFound" or
@@ -32,13 +29,11 @@ predicate isABuiltinEventName(string name) {
   name = "$stateChangeError" or
   name = "$viewContentLoading " or
   name = "$viewContentLoaded " or
-
   // $route
   name = "$routeChangeStart" or
   name = "$routeChangeSuccess" or
   name = "$routeChangeError" or
   name = "$routeUpdate" or
-
   // ngInclude
   name = "$includeContentRequested" or
   name = "$includeContentLoaded" or
@@ -49,20 +44,21 @@ predicate isABuiltinEventName(string name) {
  * Holds if user code emits or broadcasts an event named `name`.
  */
 predicate isAUserDefinedEventName(string name) {
-  exists (string methodName, MethodCallExpr mce |
-    methodName = "$emit" or methodName = "$broadcast" |
+  exists(string methodName, MethodCallExpr mce | methodName = "$emit" or methodName = "$broadcast" |
     mce.getArgument(0).mayHaveStringValue(name) and
     (
       // dataflow based scope resolution
-      mce = any(AngularJS::ScopeServiceReference scope).getAMethodCall(methodName) or
+      mce = any(AngularJS::ScopeServiceReference scope).getAMethodCall(methodName)
+      or
       // heuristic scope resolution: assume parameters like `$scope` or `$rootScope` are AngularJS scope objects
       exists(SimpleParameter param |
         param.getName() = any(AngularJS::ScopeServiceReference scope).getName() and
         mce.getReceiver().mayReferToParameter(param) and
         mce.getMethodName() = methodName
-      ) or
+      )
+      or
       // a call in an AngularJS expression
-      exists (AngularJS::NgCallExpr call |
+      exists(AngularJS::NgCallExpr call |
         call.getCallee().(AngularJS::NgVarExpr).getName() = methodName and
         call.getArgument(0).(AngularJS::NgString).getStringValue() = name
       )
@@ -71,14 +67,16 @@ predicate isAUserDefinedEventName(string name) {
 }
 
 from AngularJS::ScopeServiceReference scope, MethodCallExpr mce, string eventName
-where mce = scope.getAMethodCall("$on") and
-      mce.getArgument(0).mayHaveStringValue(eventName) and
-      not (
-        isAUserDefinedEventName(eventName) or
-        isABuiltinEventName(eventName) or
-        // external, namespaced
-        eventName.regexpMatch(".*[.:].*") or
-        // from other event system (DOM: onClick et al)
-        eventName.regexpMatch("on[A-Z][a-zA-Z]+") // camelCased with 'on'-prefix
-        )
-select mce.getArgument(1), "This event listener is dead, the event '" + eventName + "' is not emitted anywhere."
+where
+  mce = scope.getAMethodCall("$on") and
+  mce.getArgument(0).mayHaveStringValue(eventName) and
+  not (
+    isAUserDefinedEventName(eventName) or
+    isABuiltinEventName(eventName) or
+    // external, namespaced
+    eventName.regexpMatch(".*[.:].*") or
+    // from other event system (DOM: onClick et al)
+    eventName.regexpMatch("on[A-Z][a-zA-Z]+") // camelCased with 'on'-prefix
+  )
+select mce.getArgument(1),
+  "This event listener is dead, the event '" + eventName + "' is not emitted anywhere."
diff --git a/javascript/ql/src/AngularJS/DependencyMismatch.ql b/javascript/ql/src/AngularJS/DependencyMismatch.ql
index bb620167af86..314c0a12320f 100644
--- a/javascript/ql/src/AngularJS/DependencyMismatch.ql
+++ b/javascript/ql/src/AngularJS/DependencyMismatch.ql
@@ -15,16 +15,17 @@
 import javascript
 
 from AngularJS::InjectableFunction f, SimpleParameter p, string msg
-where p = f.asFunction().getAParameter() and
-      (
-        not p = f.getDependencyParameter(_) and
-        msg = "This parameter has no injected dependency."
-        or
-        exists (string n | p = f.getDependencyParameter(n) |
-          p.getName() != n and
-          exists(f.getDependencyParameter(p.getName())) and
-          msg = "This parameter is named '" + p.getName() + "', " +
-                "but actually refers to dependency '" + n + "'."
-        )
-      )
-select p, msg
\ No newline at end of file
+where
+  p = f.asFunction().getAParameter() and
+  (
+    not p = f.getDependencyParameter(_) and
+    msg = "This parameter has no injected dependency."
+    or
+    exists(string n | p = f.getDependencyParameter(n) |
+      p.getName() != n and
+      exists(f.getDependencyParameter(p.getName())) and
+      msg = "This parameter is named '" + p.getName() + "', " +
+          "but actually refers to dependency '" + n + "'."
+    )
+  )
+select p, msg
diff --git a/javascript/ql/src/AngularJS/DisablingSce.ql b/javascript/ql/src/AngularJS/DisablingSce.ql
index 52287d4adb23..c4aa3822d041 100644
--- a/javascript/ql/src/AngularJS/DisablingSce.ql
+++ b/javascript/ql/src/AngularJS/DisablingSce.ql
@@ -13,7 +13,8 @@
 import javascript
 
 from MethodCallExpr mce, AngularJS::BuiltinServiceReference service
-where service.getName() ="$sceProvider" and
-      mce = service.getAMethodCall( "enabled") and
-      mce.getArgument(0).mayHaveBooleanValue(false)
+where
+  service.getName() = "$sceProvider" and
+  mce = service.getAMethodCall("enabled") and
+  mce.getArgument(0).mayHaveBooleanValue(false)
 select mce, "Disabling SCE is strongly discouraged."
diff --git a/javascript/ql/src/AngularJS/DoubleCompilation.ql b/javascript/ql/src/AngularJS/DoubleCompilation.ql
index bc41b12d866b..74624e51c6ec 100644
--- a/javascript/ql/src/AngularJS/DoubleCompilation.ql
+++ b/javascript/ql/src/AngularJS/DoubleCompilation.ql
@@ -13,10 +13,14 @@
 import javascript
 
 from AngularJS::ServiceReference compile, SimpleParameter elem, CallExpr c
-where compile.getName() = "$compile" and
-      elem = any(AngularJS::CustomDirective d).getALinkFunction().(AngularJS::LinkFunction).getElementParameter() and
-      c = compile.getACall() and
-      c.getArgument(0).mayReferToParameter(elem) and
-      // don't flag $compile calls that specify a `maxPriority`
-      c.getNumArgument() < 3
+where
+  compile.getName() = "$compile" and
+  elem = any(AngularJS::CustomDirective d)
+        .getALinkFunction()
+        .(AngularJS::LinkFunction)
+        .getElementParameter() and
+  c = compile.getACall() and
+  c.getArgument(0).mayReferToParameter(elem) and
+  // don't flag $compile calls that specify a `maxPriority`
+  c.getNumArgument() < 3
 select c, "This call to $compile may cause double compilation of '" + elem + "'."
diff --git a/javascript/ql/src/AngularJS/DuplicateDependency.ql b/javascript/ql/src/AngularJS/DuplicateDependency.ql
index 35b39391ad93..c7d7e0c55d2a 100644
--- a/javascript/ql/src/AngularJS/DuplicateDependency.ql
+++ b/javascript/ql/src/AngularJS/DuplicateDependency.ql
@@ -13,12 +13,15 @@ import javascript
 import semmle.javascript.RestrictedLocations
 
 predicate isRepeatedDependency(AngularJS::InjectableFunction f, string name, ASTNode location) {
-  exists(int i, int j | i < j and
+  exists(int i, int j |
+    i < j and
     exists(f.getDependencyDeclaration(i, name)) and
     location = f.getDependencyDeclaration(j, name)
   )
 }
+
 from AngularJS::InjectableFunction f, ASTNode node, string name
-where isRepeatedDependency(f, name, node) and
-      not count(f.asFunction().getParameterByName(name)) > 1 // avoid duplicating reports from js/duplicate-parameter-name
-select (FirstLineOf)f.asFunction(), "This function has a duplicate dependency '$@'.", node, name
+where
+  isRepeatedDependency(f, name, node) and
+  not count(f.asFunction().getParameterByName(name)) > 1 // avoid duplicating reports from js/duplicate-parameter-name
+select f.asFunction().(FirstLineOf), "This function has a duplicate dependency '$@'.", node, name
diff --git a/javascript/ql/src/AngularJS/IncompatibleService.ql b/javascript/ql/src/AngularJS/IncompatibleService.ql
index 90c4c524aa17..b92ee93407f9 100644
--- a/javascript/ql/src/AngularJS/IncompatibleService.ql
+++ b/javascript/ql/src/AngularJS/IncompatibleService.ql
@@ -8,6 +8,7 @@
  * @tags correctness
  *       frameworks/angularjs
  */
+
 import javascript
 import AngularJS
 
@@ -63,21 +64,31 @@ predicate isWildcardKind(string kind) {
  * (see https://docs.angularjs.org/guide/di)
  */
 predicate isCompatibleRequestedService(InjectableFunctionServiceRequest request, string kind) {
-  isWildcardKind(kind) or
-  ((isServiceDirectiveOrFilterFunction(request) or
+  isWildcardKind(kind)
+  or
+  (
+    (
+      isServiceDirectiveOrFilterFunction(request) or
       isRunMethod(request) or
       isControllerFunction(request)
-    ) and (
+    ) and
+    (
       kind = "value" or
       kind = "service" or
       kind = "factory" or
       kind = "constant" or
       kind = "provider-value"
     )
-  ) or
-  (isControllerFunction(request) and
-    kind = "controller-only") or
-  (isConfigMethod(request) and (
+  )
+  or
+  (
+    isControllerFunction(request) and
+    kind = "controller-only"
+  )
+  or
+  (
+    isConfigMethod(request) and
+    (
       kind = "constant" or
       kind = "provider"
     )
@@ -89,46 +100,72 @@ predicate isCompatibleRequestedService(InjectableFunctionServiceRequest request,
  */
 string getServiceKind(InjectableFunctionServiceRequest request, string serviceName) {
   exists(ServiceReference id | id = request.getAServiceDefinition(serviceName) |
-    id = getBuiltinServiceOfKind(result) or
+    id = getBuiltinServiceOfKind(result)
+    or
     exists(CustomServiceDefinition custom |
       id = custom.getServiceReference() and
-      ((custom instanceof ValueRecipeDefinition and result = "value") or
-        (custom instanceof ServiceRecipeDefinition and result = "service") or
-        (custom instanceof FactoryRecipeDefinition and result = "factory") or
-        (custom instanceof DecoratorRecipeDefinition and result = "decorator") or
-        (custom instanceof ConstantRecipeDefinition and result = "constant") or
-        (custom instanceof ProviderRecipeDefinition and
-          if (serviceName.matches("%Provider")) then result = "provider"
+      (
+        (custom instanceof ValueRecipeDefinition and result = "value")
+        or
+        (custom instanceof ServiceRecipeDefinition and result = "service")
+        or
+        (custom instanceof FactoryRecipeDefinition and result = "factory")
+        or
+        (custom instanceof DecoratorRecipeDefinition and result = "decorator")
+        or
+        (custom instanceof ConstantRecipeDefinition and result = "constant")
+        or
+        (
+          custom instanceof ProviderRecipeDefinition and
+          if (serviceName.matches("%Provider"))
+          then result = "provider"
           else result = "provider-value"
-        ))
+        )
+      )
     )
   )
 }
 
-
-from InjectableFunctionServiceRequest request, string name, string componentDescriptionString, string compatibleWithString, string kind
+from
+  InjectableFunctionServiceRequest request, string name, string componentDescriptionString,
+  string compatibleWithString, string kind
 where
   name = request.getAServiceName() and
-  name != "$provide" and name != "$injector" and // special case: these services are always allowed
+  name != "$provide" and
+  name != "$injector" and // special case: these services are always allowed
   kind = getServiceKind(request, name) and
   exists(request.getAServiceDefinition(name)) and // ignore unknown/undefined services
   not isCompatibleRequestedService(request, kind) and
   compatibleWithString = concat(string compatibleKind |
-    isCompatibleRequestedService(request, compatibleKind) and
-    not isWildcardKind(compatibleKind) |
-    "'" + compatibleKind + "'", ", " order by compatibleKind).regexpReplaceAll(",(?=[^,]+$)", " or") and
+      isCompatibleRequestedService(request, compatibleKind) and
+      not isWildcardKind(compatibleKind)
+    |
+      "'" + compatibleKind + "'", ", "
+      order by
+        compatibleKind
+    ).regexpReplaceAll(",(?=[^,]+$)", " or") and
   (
-    (isServiceDirectiveOrFilterFunction(request) and
+    (
+      isServiceDirectiveOrFilterFunction(request) and
       componentDescriptionString = "Components such as services, directives, filters, and animations"
-    ) or
-    (isControllerFunction(request) and
+    )
+    or
+    (
+      isControllerFunction(request) and
       componentDescriptionString = "Controllers"
-    ) or
-    (isRunMethod(request) and
+    )
+    or
+    (
+      isRunMethod(request) and
       componentDescriptionString = "Run methods"
-    ) or
-    (isConfigMethod(request) and
+    )
+    or
+    (
+      isConfigMethod(request) and
       componentDescriptionString = "Config methods"
     )
   )
-select request, "'" + name + "' is a dependency of kind '" + kind + "', and cannot be injected here. " + componentDescriptionString + " can only be injected with dependencies of kind " + compatibleWithString + "."
+select request,
+  "'" + name + "' is a dependency of kind '" + kind + "', and cannot be injected here. " +
+    componentDescriptionString + " can only be injected with dependencies of kind " +
+    compatibleWithString + "."
diff --git a/javascript/ql/src/AngularJS/InsecureUrlWhitelist.ql b/javascript/ql/src/AngularJS/InsecureUrlWhitelist.ql
index 06371bdc3a7b..d363de41552c 100644
--- a/javascript/ql/src/AngularJS/InsecureUrlWhitelist.ql
+++ b/javascript/ql/src/AngularJS/InsecureUrlWhitelist.ql
@@ -17,8 +17,10 @@ import javascript
  * Holds if `setupCall` is a call to `$sceDelegateProvider.resourceUrlWhitelist` with
  * argument `list`.
  */
-predicate isResourceUrlWhitelist(DataFlow::MethodCallNode setupCall, DataFlow::ArrayCreationNode list) {
-  exists (AngularJS::ServiceReference service |
+predicate isResourceUrlWhitelist(
+  DataFlow::MethodCallNode setupCall, DataFlow::ArrayCreationNode list
+) {
+  exists(AngularJS::ServiceReference service |
     service.getName() = "$sceDelegateProvider" and
     setupCall.asExpr() = service.getAMethodCall("resourceUrlWhitelist") and
     list.flowsTo(setupCall.getArgument(0))
@@ -30,10 +32,11 @@ predicate isResourceUrlWhitelist(DataFlow::MethodCallNode setupCall, DataFlow::A
  */
 class ResourceUrlWhitelistEntry extends Expr {
   DataFlow::MethodCallNode setupCall;
+
   string pattern;
 
   ResourceUrlWhitelistEntry() {
-    exists (DataFlow::ArrayCreationNode whitelist |
+    exists(DataFlow::ArrayCreationNode whitelist |
       isResourceUrlWhitelist(setupCall, whitelist) and
       this = whitelist.getAnElement().asExpr() and
       this.mayHaveStringValue(pattern)
@@ -43,28 +46,25 @@ class ResourceUrlWhitelistEntry extends Expr {
   /**
    * Gets the method call that sets up this whitelist.
    */
-  DataFlow::MethodCallNode getSetupCall() {
-    result = setupCall
-  }
+  DataFlow::MethodCallNode getSetupCall() { result = setupCall }
 
   /**
    * Holds if this expression is insecure to use in an URL pattern whitelist due
    * to the reason given by `explanation`.
    */
   predicate isInsecure(string explanation) {
-    exists (string componentName, string component |
-      exists (int componentNumber |
+    exists(string componentName, string component |
+      exists(int componentNumber |
         componentName = "scheme" and componentNumber = 1
         or
         componentName = "domain" and componentNumber = 2
         or
         componentName = "TLD" and componentNumber = 4
-        |
+      |
         component = pattern.regexpCapture("(.*?)://(.*?(\\.(.*?))?)(:\\d+)?(/.*)?", componentNumber)
-      )
-      and
+      ) and
       explanation = "the " + componentName + " '" + component + "' is insecurely specified"
-      |
+    |
       componentName = "scheme" and component.matches("%*%")
       or
       componentName = "domain" and component.matches("%**%")
@@ -75,7 +75,8 @@ class ResourceUrlWhitelistEntry extends Expr {
 }
 
 from ResourceUrlWhitelistEntry entry, DataFlow::MethodCallNode setupCall, string explanation
-where entry.isInsecure(explanation) and
-      setupCall = entry.getSetupCall()
-select setupCall, "'$@' is not a secure whitelist entry, because " + explanation + ".",
-                  entry, entry.toString()
+where
+  entry.isInsecure(explanation) and
+  setupCall = entry.getSetupCall()
+select setupCall, "'$@' is not a secure whitelist entry, because " + explanation + ".", entry,
+  entry.toString()
diff --git a/javascript/ql/src/AngularJS/MissingExplicitInjection.ql b/javascript/ql/src/AngularJS/MissingExplicitInjection.ql
index 32c7d1a2f124..f7ff51fb5475 100644
--- a/javascript/ql/src/AngularJS/MissingExplicitInjection.ql
+++ b/javascript/ql/src/AngularJS/MissingExplicitInjection.ql
@@ -1,23 +1,26 @@
 /**
  * @name Missing explicit dependency injection
  * @description Functions without explicit dependency injections
-                will not work when their parameter names are minified.
+ *                will not work when their parameter names are minified.
  * @kind problem
  * @problem.severity warning
  * @precision high
  * @id js/angular/missing-explicit-injection
  * @tags correctness
-         maintainability
+ *         maintainability
  *       frameworks/angularjs
  */
 
 import javascript
 
 from AngularJS::InjectableFunction f1, AngularJS::InjectableFunction f2
-where f1.asFunction().getNumParameter() > 0 and
-      not exists(f1.getAnExplicitDependencyInjection()) and
-// ... but only if explicit dependencies are used somewhere else in the same file
-      f1 != f2 and
-      exists(f2.getAnExplicitDependencyInjection()) and
-      f1.getFile() = f2.getFile()
-select f1, "This function has no explicit dependency injections, but $@ has an explicit dependency injection.", f2, "this function"
+where
+  f1.asFunction().getNumParameter() > 0 and
+  not exists(f1.getAnExplicitDependencyInjection()) and
+  // ... but only if explicit dependencies are used somewhere else in the same file
+  f1 != f2 and
+  exists(f2.getAnExplicitDependencyInjection()) and
+  f1.getFile() = f2.getFile()
+select f1,
+  "This function has no explicit dependency injections, but $@ has an explicit dependency injection.",
+  f2, "this function"
diff --git a/javascript/ql/src/AngularJS/RepeatedInjection.ql b/javascript/ql/src/AngularJS/RepeatedInjection.ql
index d092a5b2a9fb..246fbbdbd1cf 100644
--- a/javascript/ql/src/AngularJS/RepeatedInjection.ql
+++ b/javascript/ql/src/AngularJS/RepeatedInjection.ql
@@ -13,6 +13,8 @@ import javascript
 import semmle.javascript.RestrictedLocations
 
 from AngularJS::InjectableFunction f, ASTNode explicitInjection
-where count(f.getAnExplicitDependencyInjection()) > 1 and
-      explicitInjection = f.getAnExplicitDependencyInjection()
-select (FirstLineOf)f.asFunction(), "This function has $@ defined in multiple places.", explicitInjection, "dependency injections"
+where
+  count(f.getAnExplicitDependencyInjection()) > 1 and
+  explicitInjection = f.getAnExplicitDependencyInjection()
+select f.asFunction().(FirstLineOf), "This function has $@ defined in multiple places.",
+  explicitInjection, "dependency injections"
diff --git a/javascript/ql/src/AngularJS/UnusedAngularDependency.ql b/javascript/ql/src/AngularJS/UnusedAngularDependency.ql
index 580beff03239..8358b2382c0c 100644
--- a/javascript/ql/src/AngularJS/UnusedAngularDependency.ql
+++ b/javascript/ql/src/AngularJS/UnusedAngularDependency.ql
@@ -22,19 +22,25 @@ predicate isUnusedParameter(Function f, string msg, Parameter parameter) {
 }
 
 predicate isMissingParameter(AngularJS::InjectableFunction f, string msg, ASTNode location) {
-    exists(int paramCount, int injectionCount |
+  exists(int paramCount, int injectionCount |
     DataFlow::valueNode(location) = f and
     paramCount = f.asFunction().getNumParameter() and
     injectionCount = count(f.getADependencyDeclaration(_)) and
     paramCount < injectionCount and
     exists(string parametersString, string dependenciesAreString |
       (if paramCount = 1 then parametersString = "parameter" else parametersString = "parameters") and
-      (if injectionCount = 1 then dependenciesAreString = "dependency is" else dependenciesAreString = "dependencies are") and
-      msg = "This function has " + paramCount + " " + parametersString + ", but " + injectionCount + " " + dependenciesAreString + " injected into it."
+      (
+        if injectionCount = 1
+        then dependenciesAreString = "dependency is"
+        else dependenciesAreString = "dependencies are"
+      ) and
+      msg = "This function has " + paramCount + " " + parametersString + ", but " + injectionCount +
+          " " + dependenciesAreString + " injected into it."
     )
   )
 }
 
 from AngularJS::InjectableFunction f, string message, ASTNode location
-where isUnusedParameter(f.asFunction(), message, location) or isMissingParameter(f, message, location)
-select (FirstLineOf)location, message
+where
+  isUnusedParameter(f.asFunction(), message, location) or isMissingParameter(f, message, location)
+select location.(FirstLineOf), message
diff --git a/javascript/ql/src/AngularJS/UseNgSrc.ql b/javascript/ql/src/AngularJS/UseNgSrc.ql
index 63c9a105f424..333b36722f53 100644
--- a/javascript/ql/src/AngularJS/UseNgSrc.ql
+++ b/javascript/ql/src/AngularJS/UseNgSrc.ql
@@ -14,12 +14,13 @@
 import javascript
 
 from HTML::Attribute attr, string name
-where name = attr.getName() and
-      // only flag URL-valued attributes...
-      (name = "href" or name = "src" or name = "srcset") and
-      // ...where the value contains some interpolated expressions
-      attr.getValue().matches("%{{%}}") and
-      // check that there is at least one use of an AngularJS attribute directive nearby
-      // (`{{...}}` is used by other templating frameworks as well)
-      any(AngularJS::DirectiveInstance d).getATarget().getElement().getRoot() = attr.getRoot()
+where
+  name = attr.getName() and
+  // only flag URL-valued attributes...
+  (name = "href" or name = "src" or name = "srcset") and
+  // ...where the value contains some interpolated expressions
+  attr.getValue().matches("%{{%}}") and
+  // check that there is at least one use of an AngularJS attribute directive nearby
+  // (`{{...}}` is used by other templating frameworks as well)
+  any(AngularJS::DirectiveInstance d).getATarget().getElement().getRoot() = attr.getRoot()
 select attr, "Use 'ng-" + name + "' instead of '" + name + "'."
diff --git a/javascript/ql/src/DOM/AmbiguousIdAttribute.ql b/javascript/ql/src/DOM/AmbiguousIdAttribute.ql
index 502f2ffc0417..583ebddb672f 100644
--- a/javascript/ql/src/DOM/AmbiguousIdAttribute.ql
+++ b/javascript/ql/src/DOM/AmbiguousIdAttribute.ql
@@ -19,15 +19,17 @@ import javascript
  *
  * Furthermore, the id is required to be valid, and not look like a template.
  */
-predicate idAt(DOM::AttributeDefinition attr, string id, DOM::ElementDefinition root, int line, int column) {
-  exists (DOM::ElementDefinition elt |
-    attr = elt.getAttributeByName("id") |
+predicate idAt(
+  DOM::AttributeDefinition attr, string id, DOM::ElementDefinition root, int line, int column
+) {
+  exists(DOM::ElementDefinition elt | attr = elt.getAttributeByName("id") |
     id = attr.getStringValue() and
     root = elt.getRoot() and
     elt.getLocation().hasLocationInfo(_, line, column, _, _) and
     not (
       // exclude invalid ids (reported by another query)
-      DOM::isInvalidHtmlIdAttributeValue(attr, _) or
+      DOM::isInvalidHtmlIdAttributeValue(attr, _)
+      or
       // exclude attribute values that look like they might be templated
       attr.mayHaveTemplateValue()
     )
@@ -39,9 +41,11 @@ predicate idAt(DOM::AttributeDefinition attr, string id, DOM::ElementDefinition
  * the same document, and `earlier` appears textually before `later`.
  */
 predicate sameId(DOM::AttributeDefinition earlier, DOM::AttributeDefinition later) {
-  exists (string id, DOM::ElementDefinition root, int l1, int c1, int l2, int c2 |
-    idAt(earlier, id, root, l1, c1) and idAt(later, id, root, l2, c2) |
-    l1 < l2 or
+  exists(string id, DOM::ElementDefinition root, int l1, int c1, int l2, int c2 |
+    idAt(earlier, id, root, l1, c1) and idAt(later, id, root, l2, c2)
+  |
+    l1 < l2
+    or
     l1 = l2 and c1 < c2
   )
 }
diff --git a/javascript/ql/src/DOM/ConflictingAttributes.ql b/javascript/ql/src/DOM/ConflictingAttributes.ql
index 9e4cf1cdccd0..44d29000fc4c 100644
--- a/javascript/ql/src/DOM/ConflictingAttributes.ql
+++ b/javascript/ql/src/DOM/ConflictingAttributes.ql
@@ -18,8 +18,9 @@ import javascript
  * and different values, where `earlier` appears textually before `later`.
  */
 predicate conflict(DOM::AttributeDefinition earlier, DOM::AttributeDefinition later) {
-  exists (DOM::ElementDefinition elt, int i, int j |
-    earlier = elt.getAttribute(i) and later = elt.getAttribute(j) |
+  exists(DOM::ElementDefinition elt, int i, int j |
+    earlier = elt.getAttribute(i) and later = elt.getAttribute(j)
+  |
     i < j and
     earlier.getName() = later.getName() and
     not earlier.getStringValue() = later.getStringValue()
@@ -28,5 +29,6 @@ predicate conflict(DOM::AttributeDefinition earlier, DOM::AttributeDefinition la
 
 from DOM::AttributeDefinition earlier, DOM::AttributeDefinition later
 where conflict(earlier, later) and not conflict(_, earlier)
-select earlier, "This attribute has the same name as $@ of the same element, " +
-       "but a different value.", later, "another attribute"
\ No newline at end of file
+select earlier,
+  "This attribute has the same name as $@ of the same element, " + "but a different value.", later,
+  "another attribute"
diff --git a/javascript/ql/src/DOM/DuplicateAttributes.ql b/javascript/ql/src/DOM/DuplicateAttributes.ql
index 02272bdd6092..b88582c0c5a5 100644
--- a/javascript/ql/src/DOM/DuplicateAttributes.ql
+++ b/javascript/ql/src/DOM/DuplicateAttributes.ql
@@ -17,8 +17,9 @@ import javascript
  * and the same value, where `earlier` appears textually before `later`.
  */
 predicate duplicate(DOM::AttributeDefinition earlier, DOM::AttributeDefinition later) {
-  exists (DOM::ElementDefinition elt, int i, int j |
-    earlier = elt.getAttribute(i) and later = elt.getAttribute(j) |
+  exists(DOM::ElementDefinition elt, int i, int j |
+    earlier = elt.getAttribute(i) and later = elt.getAttribute(j)
+  |
     i < j and
     earlier.getName() = later.getName() and
     earlier.getStringValue() = later.getStringValue()
diff --git a/javascript/ql/src/DOM/MalformedIdAttribute.ql b/javascript/ql/src/DOM/MalformedIdAttribute.ql
index fd202a3f343d..d9a99aa1937e 100644
--- a/javascript/ql/src/DOM/MalformedIdAttribute.ql
+++ b/javascript/ql/src/DOM/MalformedIdAttribute.ql
@@ -14,7 +14,8 @@
 import javascript
 
 from DOM::AttributeDefinition id, string reason
-where DOM::isInvalidHtmlIdAttributeValue(id, reason) and
-      // exclude attribute values that look like they might be templated
-      not id.mayHaveTemplateValue()
-select id, "The value of the id attribute " + reason + "."
\ No newline at end of file
+where
+  DOM::isInvalidHtmlIdAttributeValue(id, reason) and
+  // exclude attribute values that look like they might be templated
+  not id.mayHaveTemplateValue()
+select id, "The value of the id attribute " + reason + "."
diff --git a/javascript/ql/src/DOM/PseudoEval.ql b/javascript/ql/src/DOM/PseudoEval.ql
index f0b9bbcff7aa..d173c66f96a1 100644
--- a/javascript/ql/src/DOM/PseudoEval.ql
+++ b/javascript/ql/src/DOM/PseudoEval.ql
@@ -18,7 +18,7 @@ import javascript
  */
 class EvilTwin extends DataFlow::CallNode {
   EvilTwin() {
-    exists (string fn | fn = "setTimeout" or fn = "setInterval" |
+    exists(string fn | fn = "setTimeout" or fn = "setInterval" |
       this = DataFlow::globalVarRef(fn).getACall() and
       getArgument(0).asExpr() instanceof ConstantString
     )
@@ -28,7 +28,7 @@ class EvilTwin extends DataFlow::CallNode {
 /** A call to `document.write` or `document.writeln`. */
 class DocumentWrite extends DataFlow::CallNode {
   DocumentWrite() {
-    exists (string writeln |
+    exists(string writeln |
       this = DataFlow::globalVarRef("document").getAMemberCall(writeln) and
       writeln.regexpMatch("write(ln)?")
     )
@@ -37,9 +37,7 @@ class DocumentWrite extends DataFlow::CallNode {
 
 /** A call to `window.execScript`. */
 class ExecScript extends DataFlow::CallNode {
-  ExecScript() {
-    this = DataFlow::globalVarRef("execScript").getACall()
-  }
+  ExecScript() { this = DataFlow::globalVarRef("execScript").getACall() }
 }
 
 /** A call to a DOM function that may evaluate a string as code. */
diff --git a/javascript/ql/src/DOM/TargetBlank.ql b/javascript/ql/src/DOM/TargetBlank.ql
index cc48d548074e..abfb44f23b5a 100644
--- a/javascript/ql/src/DOM/TargetBlank.ql
+++ b/javascript/ql/src/DOM/TargetBlank.ql
@@ -19,15 +19,16 @@ import semmle.javascript.RestrictedLocations
  * Holds if the href attribute contains a host that we cannot determine statically.
  */
 predicate hasDynamicHrefHostAttributeValue(DOM::ElementDefinition elem) {
-  exists (DOM::AttributeDefinition attr |
+  exists(DOM::AttributeDefinition attr |
     attr = elem.getAnAttribute() and
-    attr.getName().matches("%href%") |
+    attr.getName().matches("%href%")
+  |
     // unknown string
-    not exists(attr.getStringValue()) or
-    exists (string url | url = attr.getStringValue() |
+    not exists(attr.getStringValue())
+    or
+    exists(string url | url = attr.getStringValue() |
       // fixed string with templating
-      url.regexpMatch(Templating::getDelimiterMatchingRegexp()) 
-      and
+      url.regexpMatch(Templating::getDelimiterMatchingRegexp()) and
       // ... that does not start with a fixed host or a relative path (common formats)
       not url.regexpMatch("(?i)((https?:)?//)?[-a-z0-9.]*/.*")
     )
@@ -35,23 +36,22 @@ predicate hasDynamicHrefHostAttributeValue(DOM::ElementDefinition elem) {
 }
 
 from DOM::ElementDefinition e
-where // `e` is a link that opens in a new browsing context (that is, it has `target="_blank"`)
-      e.getName() = "a" and
-      // and the host in the href is not hard-coded
-      hasDynamicHrefHostAttributeValue(e) and
-      e.getAttributeByName("target").getStringValue() = "_blank" and
-      // there is no `rel` attribute specifying link type `noopener`/`noreferrer`;
-      // `rel` attributes with non-constant value are handled conservatively
-      forall (DOM::AttributeDefinition relAttr | relAttr = e.getAttributeByName("rel") |
-        exists (string rel | rel = relAttr.getStringValue() |
-          not exists (string linkType | linkType = rel.splitAt(" ") |
-            linkType = "noopener" or
-            linkType = "noreferrer"
-          )
-        )
-      ) and
-      // exclude elements with spread attributes or dynamically computed attribute names
-      not exists (DOM::AttributeDefinition attr | attr = e.getAnAttribute() |
-        not exists(attr.getName())
+where
+  // `e` is a link that opens in a new browsing context (that is, it has `target="_blank"`)
+  e.getName() = "a" and
+  // and the host in the href is not hard-coded
+  hasDynamicHrefHostAttributeValue(e) and
+  e.getAttributeByName("target").getStringValue() = "_blank" and
+  // there is no `rel` attribute specifying link type `noopener`/`noreferrer`;
+  // `rel` attributes with non-constant value are handled conservatively
+  forall(DOM::AttributeDefinition relAttr | relAttr = e.getAttributeByName("rel") |
+    exists(string rel | rel = relAttr.getStringValue() |
+      not exists(string linkType | linkType = rel.splitAt(" ") |
+        linkType = "noopener" or
+        linkType = "noreferrer"
       )
-select (FirstLineOf)e, "External links without noopener/noreferrer are a potential security risk."
+    )
+  ) and
+  // exclude elements with spread attributes or dynamically computed attribute names
+  not exists(DOM::AttributeDefinition attr | attr = e.getAnAttribute() | not exists(attr.getName()))
+select e.(FirstLineOf), "External links without noopener/noreferrer are a potential security risk."
diff --git a/javascript/ql/src/Declarations/ArgumentsRedefined.ql b/javascript/ql/src/Declarations/ArgumentsRedefined.ql
index 8775f525d097..fdd70ac1479f 100644
--- a/javascript/ql/src/Declarations/ArgumentsRedefined.ql
+++ b/javascript/ql/src/Declarations/ArgumentsRedefined.ql
@@ -15,8 +15,9 @@ import javascript
 import Definitions
 
 from VarRef d
-where d.getVariable().(LocalVariable).getName() = "arguments" and
-      (d instanceof LValue or d instanceof VarDecl) and
-      not d.isAmbient() and
-      not d.inExternsFile()
-select d, "Redefinition of arguments."
\ No newline at end of file
+where
+  d.getVariable().(LocalVariable).getName() = "arguments" and
+  (d instanceof LValue or d instanceof VarDecl) and
+  not d.isAmbient() and
+  not d.inExternsFile()
+select d, "Redefinition of arguments."
diff --git a/javascript/ql/src/Declarations/AssignmentToConst.ql b/javascript/ql/src/Declarations/AssignmentToConst.ql
index 22699315df47..e9efb03fd838 100644
--- a/javascript/ql/src/Declarations/AssignmentToConst.ql
+++ b/javascript/ql/src/Declarations/AssignmentToConst.ql
@@ -14,9 +14,11 @@ import javascript
 import semmle.javascript.RestrictedLocations
 
 from ConstDeclStmt cds, VariableDeclarator decl, VarDef def, Variable v
-where decl = cds.getADecl() and
-      def.getAVariable() = v and
-      decl.getBindingPattern().getAVariable() = v and
-      def != decl and
-      def.(ExprOrStmt).getTopLevel() = decl.getTopLevel()
-select def.(FirstLineOf), "Assignment to variable " + v.getName() + ", which is $@ constant.", cds, "declared"
+where
+  decl = cds.getADecl() and
+  def.getAVariable() = v and
+  decl.getBindingPattern().getAVariable() = v and
+  def != decl and
+  def.(ExprOrStmt).getTopLevel() = decl.getTopLevel()
+select def.(FirstLineOf), "Assignment to variable " + v.getName() + ", which is $@ constant.", cds,
+  "declared"
diff --git a/javascript/ql/src/Declarations/BuiltinRedefined.ql b/javascript/ql/src/Declarations/BuiltinRedefined.ql
index 1d500787b238..327dfd9f06e8 100644
--- a/javascript/ql/src/Declarations/BuiltinRedefined.ql
+++ b/javascript/ql/src/Declarations/BuiltinRedefined.ql
@@ -21,26 +21,30 @@ import Definitions
 predicate acceptableRedefinition(Identifier id) {
   // function(x, y, undefined) { ... }(23, 42)
   id.getName() = "undefined" and
-  exists (ImmediatelyInvokedFunctionExpr iife |
+  exists(ImmediatelyInvokedFunctionExpr iife |
     id = iife.getParameter(iife.getInvocation().getNumArgument())
-  ) or
+  )
+  or
   // Date = global.Date
-  exists (AssignExpr assgn |
+  exists(AssignExpr assgn |
     id = assgn.getTarget() and
     id.getName() = assgn.getRhs().getUnderlyingValue().(PropAccess).getPropertyName()
-  ) or
+  )
+  or
   // var Date = global.Date
-  exists (VariableDeclarator decl |
+  exists(VariableDeclarator decl |
     id = decl.getBindingPattern() and
     id.getName() = decl.getInit().getUnderlyingValue().(PropAccess).getPropertyName()
   )
 }
 
 from DefiningIdentifier id, string name
-where not id.inExternsFile() and
-      name = id.getName() and
-      name.regexpMatch("Object|Function|Array|String|Boolean|Number|Math|Date|RegExp|Error|" +
-                       "NaN|Infinity|undefined|eval|parseInt|parseFloat|isNaN|isFinite|" +
-                       "decodeURI|decodeURIComponent|encodeURI|encodeURIComponent") and
-      not acceptableRedefinition(id)
-select id, "Redefinition of " + name + "."
\ No newline at end of file
+where
+  not id.inExternsFile() and
+  name = id.getName() and
+  name
+      .regexpMatch("Object|Function|Array|String|Boolean|Number|Math|Date|RegExp|Error|" +
+          "NaN|Infinity|undefined|eval|parseInt|parseFloat|isNaN|isFinite|" +
+          "decodeURI|decodeURIComponent|encodeURI|encodeURIComponent") and
+  not acceptableRedefinition(id)
+select id, "Redefinition of " + name + "."
diff --git a/javascript/ql/src/Declarations/ClobberingVarInit.ql b/javascript/ql/src/Declarations/ClobberingVarInit.ql
index 38e6904553aa..3c99517b4772 100644
--- a/javascript/ql/src/Declarations/ClobberingVarInit.ql
+++ b/javascript/ql/src/Declarations/ClobberingVarInit.ql
@@ -15,13 +15,15 @@ import javascript
 import semmle.javascript.RestrictedLocations
 
 from DeclStmt vds, VariableDeclarator vd1, VariableDeclarator vd2, int i, int j, Variable v
-where vd1 = vds.getDecl(i) and
-      vd2 = vds.getDecl(j) and
-      v = vd1.getBindingPattern().getAVariable() and
-      v = vd2.getBindingPattern().getAVariable() and
-      i < j and
-      // exclude a somewhat common pattern where the first declaration is used as a temporary
-      exists (Expr e1, Expr e2 | e1 = vd1.getInit() and e2 = vd2.getInit() |
-        not v.getAnAccess().getParentExpr*() = e2
-      )
-select (FirstLineOf)vd2, "This initialization of " + v.getName() + " overwrites $@.", vd1, "an earlier initialization"
\ No newline at end of file
+where
+  vd1 = vds.getDecl(i) and
+  vd2 = vds.getDecl(j) and
+  v = vd1.getBindingPattern().getAVariable() and
+  v = vd2.getBindingPattern().getAVariable() and
+  i < j and
+  // exclude a somewhat common pattern where the first declaration is used as a temporary
+  exists(Expr e1, Expr e2 | e1 = vd1.getInit() and e2 = vd2.getInit() |
+    not v.getAnAccess().getParentExpr*() = e2
+  )
+select vd2.(FirstLineOf), "This initialization of " + v.getName() + " overwrites $@.", vd1,
+  "an earlier initialization"
diff --git a/javascript/ql/src/Declarations/ConflictingFunctions.ql b/javascript/ql/src/Declarations/ConflictingFunctions.ql
index bfbbdd1cdc28..d808627c37f6 100644
--- a/javascript/ql/src/Declarations/ConflictingFunctions.ql
+++ b/javascript/ql/src/Declarations/ConflictingFunctions.ql
@@ -15,11 +15,14 @@
 import javascript
 
 from FunctionDeclStmt f, FunctionDeclStmt g
-where f.getVariable() = g.getVariable() and
-      // ignore global functions; conflicts across scripts are usually false positives
-      not f.getVariable().isGlobal() and
-      // only report each pair once
-      f.getLocation().startsBefore(g.getLocation()) and
-      // ignore ambient, abstract, and overloaded declarations in TypeScript
-      f.hasBody() and g.hasBody()
-select f.getId(), "Declaration of " + f.describe() + " conflicts with $@ in the same scope.", g.getId(), "another declaration"
\ No newline at end of file
+where
+  f.getVariable() = g.getVariable() and
+  // ignore global functions; conflicts across scripts are usually false positives
+  not f.getVariable().isGlobal() and
+  // only report each pair once
+  f.getLocation().startsBefore(g.getLocation()) and
+  // ignore ambient, abstract, and overloaded declarations in TypeScript
+  f.hasBody() and
+  g.hasBody()
+select f.getId(), "Declaration of " + f.describe() + " conflicts with $@ in the same scope.",
+  g.getId(), "another declaration"
diff --git a/javascript/ql/src/Declarations/DeadStoreOfGlobal.ql b/javascript/ql/src/Declarations/DeadStoreOfGlobal.ql
index b50975de6d69..2e6b54fc3019 100644
--- a/javascript/ql/src/Declarations/DeadStoreOfGlobal.ql
+++ b/javascript/ql/src/Declarations/DeadStoreOfGlobal.ql
@@ -14,27 +14,26 @@ import javascript
 
 /** Holds if every access to `v` is a write. */
 predicate onlyWritten(Variable v) {
-  forall (VarAccess va | va = v.getAnAccess() |
-    exists (Assignment assgn | assgn.getTarget() = va)
-  )
+  forall(VarAccess va | va = v.getAnAccess() | exists(Assignment assgn | assgn.getTarget() = va))
 }
 
 from Variable v, GlobalVarAccess gva
-where v = gva.getVariable() and
-      onlyWritten(v) and
-      // 'v' is not externally declared...
-      not exists (ExternalVarDecl d | d.getName() = v.getName() |
-        // ...as a member of {Window,Worker,WebWorker}.prototype
-        d.(ExternalInstanceMemberDecl).getBaseName().regexpMatch("Window|Worker|WebWorker") or
-        // ...or as a member of window
-        d.(ExternalStaticMemberDecl).getBaseName() = "window" or
-        // ...or as a global
-        d instanceof ExternalGlobalDecl
-      ) and
-      // it isn't declared using a linter directive
-      not exists (Linting::GlobalDeclaration decl |
-        decl.declaresGlobalForAccess(gva)
-      ) and
-      // ignore accesses under 'with', since they may well refer to properties of the with'ed object
-      not exists (WithStmt with | with.mayAffect(gva))
+where
+  v = gva.getVariable() and
+  onlyWritten(v) and
+  // 'v' is not externally declared...
+  not exists(ExternalVarDecl d | d.getName() = v.getName() |
+    // ...as a member of {Window,Worker,WebWorker}.prototype
+    d.(ExternalInstanceMemberDecl).getBaseName().regexpMatch("Window|Worker|WebWorker")
+    or
+    // ...or as a member of window
+    d.(ExternalStaticMemberDecl).getBaseName() = "window"
+    or
+    // ...or as a global
+    d instanceof ExternalGlobalDecl
+  ) and
+  // it isn't declared using a linter directive
+  not exists(Linting::GlobalDeclaration decl | decl.declaresGlobalForAccess(gva)) and
+  // ignore accesses under 'with', since they may well refer to properties of the with'ed object
+  not exists(WithStmt with | with.mayAffect(gva))
 select gva, "This definition of " + v.getName() + " is useless, since its value is never read."
diff --git a/javascript/ql/src/Declarations/DeadStoreOfLocal.ql b/javascript/ql/src/Declarations/DeadStoreOfLocal.ql
index 3299f38e93ec..c996c74a723e 100644
--- a/javascript/ql/src/Declarations/DeadStoreOfLocal.ql
+++ b/javascript/ql/src/Declarations/DeadStoreOfLocal.ql
@@ -19,33 +19,35 @@ import DeadStore
  */
 predicate deadStoreOfLocal(VarDef vd, PurelyLocalVariable v) {
   v = vd.getAVariable() and
-  exists (vd.getSource()) and
+  exists(vd.getSource()) and
   // the definition is not in dead code
-  exists (ReachableBasicBlock rbb | vd = rbb.getANode()) and
+  exists(ReachableBasicBlock rbb | vd = rbb.getANode()) and
   // but it has no associated SSA definition, that is, it is dead
-  not exists (SsaExplicitDefinition ssa | ssa.defines(vd, v))
+  not exists(SsaExplicitDefinition ssa | ssa.defines(vd, v))
 }
 
-from VarDef dead, PurelyLocalVariable v  // captured variables may be read by closures, so don't flag them
-where deadStoreOfLocal(dead, v) and
-      // the variable should be accessed somewhere; otherwise it will be flagged by UnusedVariable
-      exists(v.getAnAccess()) and
-      // don't flag ambient variable definitions
-      not dead.(ASTNode).isAmbient() and
-      // don't flag function expressions
-      not exists (FunctionExpr fe | dead = fe.getId()) and
-      // don't flag function declarations nested inside blocks or other compound statements;
-      // their meaning is only partially specified by the standard
-      not exists (FunctionDeclStmt fd, StmtContainer outer |
-        dead = fd.getId() and outer = fd.getEnclosingContainer() |
-        not fd = outer.getBody().(BlockStmt).getAStmt()
-      ) and
-      // don't flag overwrites with `null` or `undefined`
-      not SyntacticConstants::isNullOrUndefined(dead.getSource()) and
-      // don't flag default inits that are later overwritten
-      not (isDefaultInit(dead.getSource().(Expr).getUnderlyingValue()) and dead.isOverwritten(v)) and
-      // don't flag assignments in externs
-      not dead.(ASTNode).inExternsFile() and
-      // don't flag exported variables
-      not any(ES2015Module m).exportsAs(v, _)
+from VarDef dead, PurelyLocalVariable v // captured variables may be read by closures, so don't flag them
+where
+  deadStoreOfLocal(dead, v) and
+  // the variable should be accessed somewhere; otherwise it will be flagged by UnusedVariable
+  exists(v.getAnAccess()) and
+  // don't flag ambient variable definitions
+  not dead.(ASTNode).isAmbient() and
+  // don't flag function expressions
+  not exists(FunctionExpr fe | dead = fe.getId()) and
+  // don't flag function declarations nested inside blocks or other compound statements;
+  // their meaning is only partially specified by the standard
+  not exists(FunctionDeclStmt fd, StmtContainer outer |
+    dead = fd.getId() and outer = fd.getEnclosingContainer()
+  |
+    not fd = outer.getBody().(BlockStmt).getAStmt()
+  ) and
+  // don't flag overwrites with `null` or `undefined`
+  not SyntacticConstants::isNullOrUndefined(dead.getSource()) and
+  // don't flag default inits that are later overwritten
+  not (isDefaultInit(dead.getSource().(Expr).getUnderlyingValue()) and dead.isOverwritten(v)) and
+  // don't flag assignments in externs
+  not dead.(ASTNode).inExternsFile() and
+  // don't flag exported variables
+  not any(ES2015Module m).exportsAs(v, _)
 select dead, "This definition of " + v.getName() + " is useless, since its value is never read."
diff --git a/javascript/ql/src/Declarations/DeadStoreOfProperty.ql b/javascript/ql/src/Declarations/DeadStoreOfProperty.ql
index 393dfd7068e0..ab5eaa4f8777 100644
--- a/javascript/ql/src/Declarations/DeadStoreOfProperty.ql
+++ b/javascript/ql/src/Declarations/DeadStoreOfProperty.ql
@@ -17,7 +17,7 @@ import DeadStore
  */
 predicate unambiguousPropWrite(DataFlow::SourceNode base, string name, DataFlow::PropWrite write) {
   write = base.getAPropertyWrite(name) and
-  not exists (DataFlow::SourceNode otherBase |
+  not exists(DataFlow::SourceNode otherBase |
     otherBase != base and
     write = otherBase.getAPropertyWrite(name)
   )
@@ -26,8 +26,13 @@ predicate unambiguousPropWrite(DataFlow::SourceNode base, string name, DataFlow:
 /**
  * Holds if `assign1` and `assign2` both assign property `name` of the same object, and `assign2` post-dominates `assign1`.
  */
-predicate postDominatedPropWrite(string name, DataFlow::PropWrite assign1, DataFlow::PropWrite assign2) {
-  exists (ControlFlowNode write1, ControlFlowNode write2, DataFlow::SourceNode base, ReachableBasicBlock block1, ReachableBasicBlock block2 |
+predicate postDominatedPropWrite(
+  string name, DataFlow::PropWrite assign1, DataFlow::PropWrite assign2
+) {
+  exists(
+    ControlFlowNode write1, ControlFlowNode write2, DataFlow::SourceNode base,
+    ReachableBasicBlock block1, ReachableBasicBlock block2
+  |
     write1 = assign1.getWriteNode() and
     write2 = assign2.getWriteNode() and
     block1 = write1.getBasicBlock() and
@@ -35,8 +40,10 @@ predicate postDominatedPropWrite(string name, DataFlow::PropWrite assign1, DataF
     unambiguousPropWrite(base, name, assign1) and
     unambiguousPropWrite(base, name, assign2) and
     block2.postDominates(block1) and
-    (block1 = block2 implies
-      exists (int i1, int i2 |
+    (
+      block1 = block2
+      implies
+      exists(int i1, int i2 |
         write1 = block1.getNode(i1) and
         write2 = block2.getNode(i2) and
         i1 < i2
@@ -50,7 +57,8 @@ predicate postDominatedPropWrite(string name, DataFlow::PropWrite assign1, DataF
  */
 bindingset[name]
 predicate maybeAccessesProperty(Expr e, string name) {
-  (e.(PropAccess).getPropertyName() = name and e instanceof RValue) or
+  (e.(PropAccess).getPropertyName() = name and e instanceof RValue)
+  or
   // conservatively reject all side-effects
   e.isImpure()
 }
@@ -70,12 +78,13 @@ predicate isDeadAssignment(string name, DataFlow::PropWrite assign1, DataFlow::P
  */
 bindingset[name]
 predicate maybeAccessesAssignedPropInBlock(string name, DataFlow::PropWrite assign, boolean after) {
-  exists (ControlFlowNode write, ReachableBasicBlock block, int i, int j, Expr e |
+  exists(ControlFlowNode write, ReachableBasicBlock block, int i, int j, Expr e |
     write = assign.getWriteNode() and
     block = assign.getBasicBlock() and
     write = block.getNode(i) and
     e = block.getNode(j) and
-    maybeAccessesProperty(e, name) |
+    maybeAccessesProperty(e, name)
+  |
     after = true and i < j
     or
     after = false and j < i
@@ -87,30 +96,37 @@ predicate maybeAccessesAssignedPropInBlock(string name, DataFlow::PropWrite assi
  */
 bindingset[name]
 predicate noPropAccessBetween(string name, DataFlow::PropWrite assign1, DataFlow::PropWrite assign2) {
-  exists (ControlFlowNode write1, ControlFlowNode write2, ReachableBasicBlock block1, ReachableBasicBlock block2 |
+  exists(
+    ControlFlowNode write1, ControlFlowNode write2, ReachableBasicBlock block1,
+    ReachableBasicBlock block2
+  |
     write1 = assign1.getWriteNode() and
     write2 = assign2.getWriteNode() and
     write1.getBasicBlock() = block1 and
     write2.getBasicBlock() = block2 and
-    if block1 = block2 then
+    if block1 = block2
+    then
       // same block: check for access between
-      not exists (int i1, Expr mid, int i2 |
+      not exists(int i1, Expr mid, int i2 |
         assign1.getWriteNode() = block1.getNode(i1) and
         assign2.getWriteNode() = block2.getNode(i2) and
-        mid = block1.getNode([i1+1..i2-1]) and
+        mid = block1.getNode([i1 + 1 .. i2 - 1]) and
         maybeAccessesProperty(mid, name)
       )
     else
       // other block:
       not (
         // check for an access after the first write node
-        maybeAccessesAssignedPropInBlock(name, assign1, true) or
+        maybeAccessesAssignedPropInBlock(name, assign1, true)
+        or
         // check for an access between the two write blocks
-        exists (ReachableBasicBlock mid |
+        exists(ReachableBasicBlock mid |
           block1.getASuccessor+() = mid and
-          mid.getASuccessor+() = block2 |
+          mid.getASuccessor+() = block2
+        |
           maybeAccessesProperty(mid.getANode(), name)
-        ) or
+        )
+        or
         // check for an access before the second write node
         maybeAccessesAssignedPropInBlock(name, assign2, false)
       )
@@ -118,25 +134,29 @@ predicate noPropAccessBetween(string name, DataFlow::PropWrite assign1, DataFlow
 }
 
 from string name, DataFlow::PropWrite assign1, DataFlow::PropWrite assign2
-where isDeadAssignment(name, assign1, assign2) and
-      // whitelist
-      not (
-        // Google Closure Compiler pattern: `o.p = o['p'] = v`
-        exists (PropAccess p1, PropAccess p2 |
-          p1 = assign1.getAstNode() and
-          p2 = assign2.getAstNode() |
-          p1 instanceof DotExpr and p2 instanceof IndexExpr
-          or
-          p2 instanceof DotExpr and p1 instanceof IndexExpr
-        )
-        or
-        // don't flag overwrites for default values
-        isDefaultInit(assign1.getRhs().asExpr().getUnderlyingValue())
-        or
-        // don't flag assignments in externs
-        assign1.getAstNode().inExternsFile()
-        or
-        // exclude result from js/overwritten-property
-        assign2.getBase() instanceof DataFlow::ObjectLiteralNode
-      )
-select assign1.getWriteNode(), "This write to property '" + name + "' is useless, since $@ always overrides it.", assign2.getWriteNode(), "another property write"
+where
+  isDeadAssignment(name, assign1, assign2) and
+  // whitelist
+  not (
+    // Google Closure Compiler pattern: `o.p = o['p'] = v`
+    exists(PropAccess p1, PropAccess p2 |
+      p1 = assign1.getAstNode() and
+      p2 = assign2.getAstNode()
+    |
+      p1 instanceof DotExpr and p2 instanceof IndexExpr
+      or
+      p2 instanceof DotExpr and p1 instanceof IndexExpr
+    )
+    or
+    // don't flag overwrites for default values
+    isDefaultInit(assign1.getRhs().asExpr().getUnderlyingValue())
+    or
+    // don't flag assignments in externs
+    assign1.getAstNode().inExternsFile()
+    or
+    // exclude result from js/overwritten-property
+    assign2.getBase() instanceof DataFlow::ObjectLiteralNode
+  )
+select assign1.getWriteNode(),
+  "This write to property '" + name + "' is useless, since $@ always overrides it.",
+  assign2.getWriteNode(), "another property write"
diff --git a/javascript/ql/src/Declarations/DeclBeforeUse.ql b/javascript/ql/src/Declarations/DeclBeforeUse.ql
index 985a1a6be7ba..49a7a3f01c83 100644
--- a/javascript/ql/src/Declarations/DeclBeforeUse.ql
+++ b/javascript/ql/src/Declarations/DeclBeforeUse.ql
@@ -13,20 +13,20 @@ import javascript
 private import Declarations
 
 from VarAccess acc, VarDecl decl, Variable var, StmtContainer sc
-where // the first reference to `var` in `sc` is `acc` (that is, an access, not a declaration)
-      acc = firstRefInContainer(var, Ref(), sc) and
-      // `decl` is a declaration of `var` in `sc` (which must come after `acc`)
-      decl = refInContainer(var, Decl(), sc) and
-      // exclude globals declared by a linter directive
-      not exists(Linting::GlobalDeclaration glob |
-        glob.declaresGlobalForAccess(acc)
-      ) and
-      // exclude declarations in synthetic constructors
-      not acc.getEnclosingFunction() instanceof SyntheticConstructor and
-      // exclude results in ambient contexts
-      not acc.isAmbient() and
-      // a class may be referenced in its own decorators
-      not exists (ClassDefinition cls |
-        decl = cls.getIdentifier() and
-        acc.getParent*() = cls.getADecorator())
+where
+  // the first reference to `var` in `sc` is `acc` (that is, an access, not a declaration)
+  acc = firstRefInContainer(var, Ref(), sc) and
+  // `decl` is a declaration of `var` in `sc` (which must come after `acc`)
+  decl = refInContainer(var, Decl(), sc) and
+  // exclude globals declared by a linter directive
+  not exists(Linting::GlobalDeclaration glob | glob.declaresGlobalForAccess(acc)) and
+  // exclude declarations in synthetic constructors
+  not acc.getEnclosingFunction() instanceof SyntheticConstructor and
+  // exclude results in ambient contexts
+  not acc.isAmbient() and
+  // a class may be referenced in its own decorators
+  not exists(ClassDefinition cls |
+    decl = cls.getIdentifier() and
+    acc.getParent*() = cls.getADecorator()
+  )
 select acc, "Variable '" + acc.getName() + "' is used before its $@.", decl, "declaration"
diff --git a/javascript/ql/src/Declarations/Declarations.qll b/javascript/ql/src/Declarations/Declarations.qll
index 15a1f8549198..1ebf94f711a3 100644
--- a/javascript/ql/src/Declarations/Declarations.qll
+++ b/javascript/ql/src/Declarations/Declarations.qll
@@ -12,7 +12,9 @@ import javascript
  * Note that references that are not declarations are called accesses elsewhere,
  * but they are not treated specially in this context.
  */
-newtype RefKind = Ref() or Decl()
+newtype RefKind =
+  Ref() or
+  Decl()
 
 /**
  * Gets a reference to `var` (if `kind` is `Ref()`) or declaration of
@@ -30,8 +32,9 @@ VarRef refInContainer(Variable var, RefKind kind, StmtContainer sc) {
  */
 VarRef firstRefInContainer(Variable var, RefKind kind, StmtContainer sc) {
   result = min(refInContainer(var, kind, sc) as ref
-               order by ref.getLocation().getStartLine(),
-                        ref.getLocation().getStartColumn())
+      order by
+        ref.getLocation().getStartLine(), ref.getLocation().getStartColumn()
+    )
 }
 
 /**
@@ -50,6 +53,7 @@ VarRef refInTopLevel(Variable var, RefKind kind, TopLevel tl) {
  */
 VarRef firstRefInTopLevel(Variable var, RefKind kind, TopLevel tl) {
   result = min(refInTopLevel(var, kind, tl) as ref
-               order by ref.getLocation().getStartLine(),
-                        ref.getLocation().getStartColumn())
+      order by
+        ref.getLocation().getStartLine(), ref.getLocation().getStartColumn()
+    )
 }
diff --git a/javascript/ql/src/Declarations/DefaultArgumentReferencesNestedFunction.ql b/javascript/ql/src/Declarations/DefaultArgumentReferencesNestedFunction.ql
index f64c1850a595..cd13314095c1 100644
--- a/javascript/ql/src/Declarations/DefaultArgumentReferencesNestedFunction.ql
+++ b/javascript/ql/src/Declarations/DefaultArgumentReferencesNestedFunction.ql
@@ -22,6 +22,7 @@ predicate accessToNestedFunction(VarAccess va, FunctionDeclStmt inner, Function
 }
 
 from Function f, VarAccess va, FunctionDeclStmt g
-where accessToNestedFunction(va, g, f) and
-      va.getParentExpr*() = f.getAParameter().getDefault()
-select va, "This expression refers to $@ before it is defined.", g, g.getName()
\ No newline at end of file
+where
+  accessToNestedFunction(va, g, f) and
+  va.getParentExpr*() = f.getAParameter().getDefault()
+select va, "This expression refers to $@ before it is defined.", g, g.getName()
diff --git a/javascript/ql/src/Declarations/DuplicateVarDecl.ql b/javascript/ql/src/Declarations/DuplicateVarDecl.ql
index 0077361d60f8..048eb15e9f49 100644
--- a/javascript/ql/src/Declarations/DuplicateVarDecl.ql
+++ b/javascript/ql/src/Declarations/DuplicateVarDecl.ql
@@ -12,9 +12,10 @@
 import javascript
 
 from DeclStmt vds, VariableDeclarator vd1, int i, VariableDeclarator vd2, int j, Variable v
-where vd1 = vds.getDecl(i) and
-      vd2 = vds.getDecl(j) and
-      vd1.getBindingPattern().getAVariable() = v and
-      vd2.getBindingPattern().getAVariable() = v and
-      i < j
-select vd2, "Variable " + v.getName() + " has already been declared $@.", vd1, "here"
\ No newline at end of file
+where
+  vd1 = vds.getDecl(i) and
+  vd2 = vds.getDecl(j) and
+  vd1.getBindingPattern().getAVariable() = v and
+  vd2.getBindingPattern().getAVariable() = v and
+  i < j
+select vd2, "Variable " + v.getName() + " has already been declared $@.", vd1, "here"
diff --git a/javascript/ql/src/Declarations/IneffectiveParameterType.ql b/javascript/ql/src/Declarations/IneffectiveParameterType.ql
index 68e3f5ea5aac..8e4eb82bcf89 100644
--- a/javascript/ql/src/Declarations/IneffectiveParameterType.ql
+++ b/javascript/ql/src/Declarations/IneffectiveParameterType.ql
@@ -26,25 +26,29 @@ predicate isCommonPredefinedTypeName(string name) {
  */
 class DefiniteTypeDecl extends TypeDecl {
   DefiniteTypeDecl() {
-    this = any(ImportSpecifier im).getLocal()
-    implies
-    exists(getLocalTypeName().getAnAccess())
+    this = any(ImportSpecifier im).getLocal() implies exists(getLocalTypeName().getAnAccess())
   }
 }
 
 from SimpleParameter parameter, Function function, Locatable link, string linkText
-where function.getFile().getFileType().isTypeScript()
-  and function.getAParameter() = parameter
-  and not function.hasBody()
-  and not exists(parameter.getTypeAnnotation())
-  and (
-    isCommonPredefinedTypeName(parameter.getName()) and link = parameter and linkText = "predefined type '" + parameter.getName() + "'"
+where
+  function.getFile().getFileType().isTypeScript() and
+  function.getAParameter() = parameter and
+  not function.hasBody() and
+  not exists(parameter.getTypeAnnotation()) and
+  (
+    isCommonPredefinedTypeName(parameter.getName()) and
+    link = parameter and
+    linkText = "predefined type '" + parameter.getName() + "'"
     or
-    exists (DefiniteTypeDecl decl, LocalTypeName typename |
+    exists(DefiniteTypeDecl decl, LocalTypeName typename |
       decl = typename.getFirstDeclaration() and
       parameter.getVariable().getScope().getOuterScope*() = typename.getScope() and
       decl.getName() = parameter.getName() and
       link = decl and
-      linkText = decl.describe())
+      linkText = decl.describe()
+    )
   )
-select parameter, "The parameter '" + parameter.getName() + "' has type 'any', but its name coincides with the $@.", link, linkText
+select parameter,
+  "The parameter '" + parameter.getName() + "' has type 'any', but its name coincides with the $@.",
+  link, linkText
diff --git a/javascript/ql/src/Declarations/InefficientMethodDefinition.ql b/javascript/ql/src/Declarations/InefficientMethodDefinition.ql
index a3c700c61611..fac9046e631a 100644
--- a/javascript/ql/src/Declarations/InefficientMethodDefinition.ql
+++ b/javascript/ql/src/Declarations/InefficientMethodDefinition.ql
@@ -18,7 +18,7 @@ import semmle.javascript.RestrictedLocations
  * Holds if `stmt` is of the form `this.<name> = <method>;`.
  */
 predicate methodDefinition(ExprStmt stmt, string name, Function method) {
-  exists (AssignExpr assgn, PropAccess pacc |
+  exists(AssignExpr assgn, PropAccess pacc |
     assgn = stmt.getExpr() and
     pacc = assgn.getLhs() and
     pacc.getBase() instanceof ThisExpr and
@@ -28,12 +28,14 @@ predicate methodDefinition(ExprStmt stmt, string name, Function method) {
 }
 
 from Function ctor, ExprStmt defn, string name, Function method
-where not ctor instanceof ImmediatelyInvokedFunctionExpr and
-      defn = ctor.getABodyStmt() and
-      methodDefinition(defn, name, method) and
-      // if the method captures a local variable of the constructor, it cannot
-      // easily be moved to the constructor object
-      not exists (Variable v | v.getScope() = ctor.getScope() |
-          v.getAnAccess().getContainer().getEnclosingContainer*() = method
-      )
-select (FirstLineOf)defn, name + " should be added to the prototype object rather than to each instance."
\ No newline at end of file
+where
+  not ctor instanceof ImmediatelyInvokedFunctionExpr and
+  defn = ctor.getABodyStmt() and
+  methodDefinition(defn, name, method) and
+  // if the method captures a local variable of the constructor, it cannot
+  // easily be moved to the constructor object
+  not exists(Variable v | v.getScope() = ctor.getScope() |
+    v.getAnAccess().getContainer().getEnclosingContainer*() = method
+  )
+select defn.(FirstLineOf),
+  name + " should be added to the prototype object rather than to each instance."
diff --git a/javascript/ql/src/Declarations/MissingThisQualifier.ql b/javascript/ql/src/Declarations/MissingThisQualifier.ql
index 9a57ec987f89..c18388cb80c9 100644
--- a/javascript/ql/src/Declarations/MissingThisQualifier.ql
+++ b/javascript/ql/src/Declarations/MissingThisQualifier.ql
@@ -1,14 +1,14 @@
 /**
-* @name Missing 'this' qualifier
-* @description Referencing an undeclared global variable in a class that has a member of the same name is confusing and may indicate a bug.
-* @kind problem
-* @problem.severity error
-* @id js/missing-this-qualifier
-* @tags maintainability
-*       correctness
-*       methods
-* @precision high
-*/
+ * @name Missing 'this' qualifier
+ * @description Referencing an undeclared global variable in a class that has a member of the same name is confusing and may indicate a bug.
+ * @kind problem
+ * @problem.severity error
+ * @id js/missing-this-qualifier
+ * @tags maintainability
+ *       correctness
+ *       methods
+ * @precision high
+ */
 
 import javascript
 
@@ -26,38 +26,37 @@ predicate maybeMissingThis(CallExpr call, MethodDeclaration intendedTarget, Glob
 }
 
 from CallExpr call, MethodDeclaration intendedTarget, GlobalVariable gv
-where maybeMissingThis(call, intendedTarget, gv)
-      and
-      // exceptions:
-      not (
-        // affected by `with`
-        exists (WithStmt with | with.mayAffect(call.getCallee()))
-        or
-        // locally declared, so probably intentional
-        gv.getADeclaration().getTopLevel() = call.getTopLevel()
-        or
-        // linter declaration for the variable
-        exists (Linting::GlobalDeclaration glob |
-            glob.declaresGlobalForAccess(call.getCallee())
-        )
-        or
-        // externs declaration for the variable
-        exists (ExternalGlobalDecl egd | egd.getName() = call.getCalleeName())
-        or
-        // variable available through a namespace
-        exists (Variable decl |
-          decl.getName() = gv.getName() and
-          decl.isNamespaceExport() and
-          call.getContainer().getEnclosingContainer*() instanceof NamespaceDeclaration
-        )
-        or
-        // call to global function with additional arguments
-        exists (Function self |
-          intendedTarget.getBody() = self and
-          call.getEnclosingFunction() = self and
-          call.flow().(DataFlow::CallNode).getNumArgument() > self.getNumParameter() and
-          not self.hasRestParameter() and
-          not self.usesArgumentsObject()
-        )
-      )
-select call, "This call refers to a global function, and not the local method $@.", intendedTarget, intendedTarget.getName()
+where
+  maybeMissingThis(call, intendedTarget, gv) and
+  // exceptions:
+  not (
+    // affected by `with`
+    exists(WithStmt with | with.mayAffect(call.getCallee()))
+    or
+    // locally declared, so probably intentional
+    gv.getADeclaration().getTopLevel() = call.getTopLevel()
+    or
+    // linter declaration for the variable
+    exists(Linting::GlobalDeclaration glob | glob.declaresGlobalForAccess(call.getCallee()))
+    or
+    // externs declaration for the variable
+    exists(ExternalGlobalDecl egd | egd.getName() = call.getCalleeName())
+    or
+    // variable available through a namespace
+    exists(Variable decl |
+      decl.getName() = gv.getName() and
+      decl.isNamespaceExport() and
+      call.getContainer().getEnclosingContainer*() instanceof NamespaceDeclaration
+    )
+    or
+    // call to global function with additional arguments
+    exists(Function self |
+      intendedTarget.getBody() = self and
+      call.getEnclosingFunction() = self and
+      call.flow().(DataFlow::CallNode).getNumArgument() > self.getNumParameter() and
+      not self.hasRestParameter() and
+      not self.usesArgumentsObject()
+    )
+  )
+select call, "This call refers to a global function, and not the local method $@.", intendedTarget,
+  intendedTarget.getName()
diff --git a/javascript/ql/src/Declarations/MissingVarDecl.ql b/javascript/ql/src/Declarations/MissingVarDecl.ql
index 4a180408cb5b..8b72adcd6188 100644
--- a/javascript/ql/src/Declarations/MissingVarDecl.ql
+++ b/javascript/ql/src/Declarations/MissingVarDecl.ql
@@ -17,12 +17,10 @@ import javascript
  * but not declared in the same toplevel as `f`.
  */
 GlobalVariable undeclaredGlobalIn(Function f) {
-  exists (GlobalVarAccess gva | gva = result.getAnAccess() |
+  exists(GlobalVarAccess gva | gva = result.getAnAccess() |
     gva.getEnclosingFunction() = f and
     not result.declaredIn(f.getTopLevel()) and
-    not exists (Linting::GlobalDeclaration gd |
-      gd.declaresGlobalForAccess(gva)
-    )
+    not exists(Linting::GlobalDeclaration gd | gd.declaresGlobalForAccess(gva))
   )
 }
 
@@ -33,9 +31,7 @@ GlobalVariable undeclaredGlobalIn(Function f) {
  */
 GlobalVariable accidentalGlobalIn(Function f) {
   result = undeclaredGlobalIn(f) and
-  exists (BasicBlock startBB | startBB = f.getStartBB() |
-    not startBB.isLiveAtEntry(result)
-  )
+  exists(BasicBlock startBB | startBB = f.getStartBB() | not startBB.isLiveAtEntry(result))
 }
 
 /**
@@ -62,9 +58,12 @@ GlobalVarAccess getAccessIn(GlobalVariable v, Function f) {
  */
 GlobalVarAccess getFirstAccessIn(GlobalVariable v, Function f) {
   result = min(getAccessIn(v, f) as gva
-               order by gva.getLocation().getStartLine(), gva.getLocation().getStartColumn())
+      order by
+        gva.getLocation().getStartLine(), gva.getLocation().getStartColumn()
+    )
 }
 
 from Function f, GlobalVariable gv
 where gv = candidateVariable(f)
-select getFirstAccessIn(gv, f), "Variable " + gv.getName() + " is used like a local variable, but is missing a declaration."
\ No newline at end of file
+select getFirstAccessIn(gv, f),
+  "Variable " + gv.getName() + " is used like a local variable, but is missing a declaration."
diff --git a/javascript/ql/src/Declarations/MixedStaticInstanceThisAccess.ql b/javascript/ql/src/Declarations/MixedStaticInstanceThisAccess.ql
index d322b13bbe3b..c41b514737a4 100644
--- a/javascript/ql/src/Declarations/MixedStaticInstanceThisAccess.ql
+++ b/javascript/ql/src/Declarations/MixedStaticInstanceThisAccess.ql
@@ -1,13 +1,14 @@
 /**
-* @name Wrong use of 'this' for static method
-* @description A reference to a static method from within an instance method needs to be qualified with the class name, not `this`.
-* @kind problem
-* @problem.severity error
-* @id js/mixed-static-instance-this-access
-* @tags correctness
-*       methods
-* @precision high
-*/
+ * @name Wrong use of 'this' for static method
+ * @description A reference to a static method from within an instance method needs to be qualified with the class name, not `this`.
+ * @kind problem
+ * @problem.severity error
+ * @id js/mixed-static-instance-this-access
+ * @tags correctness
+ *       methods
+ * @precision high
+ */
+
 import javascript
 
 /** Holds if `base` declares or inherits method `m` with the given `name`. */
@@ -17,11 +18,13 @@ predicate hasMethod(ClassDefinition base, string name, MethodDefinition m) {
 }
 
 /**
-* Holds if `access` is in`fromMethod`, and it references `toMethod` through `this`,
-* where `fromMethod` and `toMethod` are of kind `fromKind` and `toKind`, respectively.
-*/
-predicate isLocalMethodAccess(PropAccess access, MethodDefinition fromMethod, string fromKind,
-  MethodDefinition toMethod, string toKind) {
+ * Holds if `access` is in`fromMethod`, and it references `toMethod` through `this`,
+ * where `fromMethod` and `toMethod` are of kind `fromKind` and `toKind`, respectively.
+ */
+predicate isLocalMethodAccess(
+  PropAccess access, MethodDefinition fromMethod, string fromKind, MethodDefinition toMethod,
+  string toKind
+) {
   hasMethod(fromMethod.getDeclaringClass(), access.getPropertyName(), toMethod) and
   access.getEnclosingFunction() = fromMethod.getBody() and
   access.getBase() instanceof ThisExpr and
@@ -33,25 +36,31 @@ string getKind(MethodDefinition m) {
   if m.isStatic() then result = "static" else result = "instance"
 }
 
-from PropAccess access, MethodDefinition fromMethod, MethodDefinition toMethod, string fromKind, string toKind
+from
+  PropAccess access, MethodDefinition fromMethod, MethodDefinition toMethod, string fromKind,
+  string toKind
 where
-    isLocalMethodAccess(access, fromMethod, fromKind, toMethod, toKind) and
-    toKind != fromKind and
-
-    // exceptions
-    not (
-        // the class has a second member with the same name and the right kind
-        isLocalMethodAccess(access, fromMethod, _, _, fromKind)
-        or
-        // there is a dynamically assigned second member with the same name and the right kind
-        exists (AnalyzedPropertyWrite apw, AbstractClass declaringClass, AbstractValue base |
-          "static" = fromKind and base = declaringClass or
-          "instance" = fromKind and base = TAbstractInstance(declaringClass) |
-          declaringClass = TAbstractClass(fromMethod.getDeclaringClass()) and
-          apw.writes(base, access.getPropertyName(), _)
-        )
-        or
-        // the access is an assignment, probably deliberate
-        access instanceof LValue
+  isLocalMethodAccess(access, fromMethod, fromKind, toMethod, toKind) and
+  toKind != fromKind and
+  // exceptions
+  not (
+    // the class has a second member with the same name and the right kind
+    isLocalMethodAccess(access, fromMethod, _, _, fromKind)
+    or
+    // there is a dynamically assigned second member with the same name and the right kind
+    exists(AnalyzedPropertyWrite apw, AbstractClass declaringClass, AbstractValue base |
+      "static" = fromKind and base = declaringClass
+      or
+      "instance" = fromKind and base = TAbstractInstance(declaringClass)
+    |
+      declaringClass = TAbstractClass(fromMethod.getDeclaringClass()) and
+      apw.writes(base, access.getPropertyName(), _)
     )
-select access, "Access to " + toKind + " method $@ from " + fromKind + " method $@ is not possible through `this`.", toMethod, toMethod.getName(), fromMethod, fromMethod.getName()
+    or
+    // the access is an assignment, probably deliberate
+    access instanceof LValue
+  )
+select access,
+  "Access to " + toKind + " method $@ from " + fromKind +
+    " method $@ is not possible through `this`.", toMethod, toMethod.getName(), fromMethod,
+  fromMethod.getName()
diff --git a/javascript/ql/src/Declarations/RedeclaredVariable.ql b/javascript/ql/src/Declarations/RedeclaredVariable.ql
index 08ef0760a52c..eb3b7261efaa 100644
--- a/javascript/ql/src/Declarations/RedeclaredVariable.ql
+++ b/javascript/ql/src/Declarations/RedeclaredVariable.ql
@@ -13,17 +13,15 @@ import javascript
 private import Declarations
 
 from Variable v, TopLevel tl, VarDecl decl, VarDecl redecl
-where decl = firstRefInTopLevel(v, Decl(), tl) and
-      redecl = refInTopLevel(v, Decl(), tl) and
-      redecl != decl and
-      not tl.isExterns() and
-
-      // Ignore redeclared ambient declarations, such as overloaded functions.
-      not decl.isAmbient() and
-      not redecl.isAmbient() and
-
-      // Redeclaring a namespace extends the previous definition.
-      not decl = any(NamespaceDeclaration ns).getId() and
-      not redecl = any(NamespaceDeclaration ns).getId()
-
-select redecl, "This variable has already been declared $@.", decl, "here"
\ No newline at end of file
+where
+  decl = firstRefInTopLevel(v, Decl(), tl) and
+  redecl = refInTopLevel(v, Decl(), tl) and
+  redecl != decl and
+  not tl.isExterns() and
+  // Ignore redeclared ambient declarations, such as overloaded functions.
+  not decl.isAmbient() and
+  not redecl.isAmbient() and
+  // Redeclaring a namespace extends the previous definition.
+  not decl = any(NamespaceDeclaration ns).getId() and
+  not redecl = any(NamespaceDeclaration ns).getId()
+select redecl, "This variable has already been declared $@.", decl, "here"
diff --git a/javascript/ql/src/Declarations/TemporalDeadZone.ql b/javascript/ql/src/Declarations/TemporalDeadZone.ql
index 7747b6110812..dbb5f7275d35 100644
--- a/javascript/ql/src/Declarations/TemporalDeadZone.ql
+++ b/javascript/ql/src/Declarations/TemporalDeadZone.ql
@@ -22,11 +22,12 @@ int letDeclAt(BlockStmt blk, Variable v, LetStmt let) {
 }
 
 from VarAccess va, LetStmt let, BlockStmt blk, int i, int j, Variable v
-where v = va.getVariable() and
-      j = letDeclAt(blk, v, let) and
-      blk.getStmt(i) = va.getEnclosingStmt().getParentStmt*() and
-      i < j and
-      // don't flag uses in different functions
-      blk.getContainer() = va.getContainer() and
-      not letDeclAt(blk, v, _) < i
-select va, "This expression refers to $@ inside its temporal dead zone.",  let, va.getName()
+where
+  v = va.getVariable() and
+  j = letDeclAt(blk, v, let) and
+  blk.getStmt(i) = va.getEnclosingStmt().getParentStmt*() and
+  i < j and
+  // don't flag uses in different functions
+  blk.getContainer() = va.getContainer() and
+  not letDeclAt(blk, v, _) < i
+select va, "This expression refers to $@ inside its temporal dead zone.", let, va.getName()
diff --git a/javascript/ql/src/Declarations/TooManyParameters.ql b/javascript/ql/src/Declarations/TooManyParameters.ql
index 062675a047a0..7cdae429322e 100644
--- a/javascript/ql/src/Declarations/TooManyParameters.ql
+++ b/javascript/ql/src/Declarations/TooManyParameters.ql
@@ -13,8 +13,10 @@ import javascript
 import semmle.javascript.RestrictedLocations
 
 from Function f
-where not f.inExternsFile() and
-      f.getNumParameter() > 7 and
-      // exclude AMD modules
-      not exists (AMDModuleDefinition m | f = m.getFactoryNode().(DataFlow::FunctionNode).getAstNode())
-select (FirstLineOf)f, capitalize(f.describe()) + " has too many parameters (" + f.getNumParameter() + ")."
\ No newline at end of file
+where
+  not f.inExternsFile() and
+  f.getNumParameter() > 7 and
+  // exclude AMD modules
+  not exists(AMDModuleDefinition m | f = m.getFactoryNode().(DataFlow::FunctionNode).getAstNode())
+select f.(FirstLineOf),
+  capitalize(f.describe()) + " has too many parameters (" + f.getNumParameter() + ")."
diff --git a/javascript/ql/src/Declarations/UniqueParameterNames.ql b/javascript/ql/src/Declarations/UniqueParameterNames.ql
index c30fe5872af6..baaed809c4df 100644
--- a/javascript/ql/src/Declarations/UniqueParameterNames.ql
+++ b/javascript/ql/src/Declarations/UniqueParameterNames.ql
@@ -30,11 +30,12 @@ predicate isDummy(SimpleParameter p) {
 }
 
 from Function f, Parameter p, Parameter q, int i, int j, string name
-where parmBinds(f, i, p, name) and
-      parmBinds(f, j, q, name) and
-      i < j and
-      j = max(int k | parmBinds(f, k, _, name) | k) and
-      not isDummy(p) and
-      // duplicate parameters in strict mode functions are flagged by the 'Syntax error' rule
-      not f.isStrict()
-select p, "This parameter has the same name as $@ of the same function.", q, "another parameter"
\ No newline at end of file
+where
+  parmBinds(f, i, p, name) and
+  parmBinds(f, j, q, name) and
+  i < j and
+  j = max(int k | parmBinds(f, k, _, name) | k) and
+  not isDummy(p) and
+  // duplicate parameters in strict mode functions are flagged by the 'Syntax error' rule
+  not f.isStrict()
+select p, "This parameter has the same name as $@ of the same function.", q, "another parameter"
diff --git a/javascript/ql/src/Declarations/UniquePropertyNames.ql b/javascript/ql/src/Declarations/UniquePropertyNames.ql
index 2485006cbb41..e98857945ad8 100644
--- a/javascript/ql/src/Declarations/UniquePropertyNames.ql
+++ b/javascript/ql/src/Declarations/UniquePropertyNames.ql
@@ -32,7 +32,7 @@ predicate hasProperty(ObjectExpr o, Property p, string name, int kind, int i) {
  * both have the same name and kind, but are not structurally identical.
  */
 predicate overwrittenBy(Property p, Property q) {
-  exists (ObjectExpr o, string name, int i, int j, int kind |
+  exists(ObjectExpr o, string name, int i, int j, int kind |
     hasProperty(o, p, name, kind, i) and
     hasProperty(o, q, name, kind, j) and
     i < j
@@ -43,7 +43,8 @@ predicate overwrittenBy(Property p, Property q) {
 }
 
 from Property p, Property q
-where overwrittenBy(p, q) and
-      // ensure that `q` is the last property with the same name as `p`
-      not overwrittenBy(q, _)
-select p, "This property is overwritten by $@ in the same object literal.", q, "another property"
\ No newline at end of file
+where
+  overwrittenBy(p, q) and
+  // ensure that `q` is the last property with the same name as `p`
+  not overwrittenBy(q, _)
+select p, "This property is overwritten by $@ in the same object literal.", q, "another property"
diff --git a/javascript/ql/src/Declarations/UnstableCyclicImport.ql b/javascript/ql/src/Declarations/UnstableCyclicImport.ql
index d0c8bb7e0f9c..2fb94eb054ac 100644
--- a/javascript/ql/src/Declarations/UnstableCyclicImport.ql
+++ b/javascript/ql/src/Declarations/UnstableCyclicImport.ql
@@ -19,27 +19,26 @@ import javascript
  * as part of the top-level means cyclic imports can't be known to be resolved at this stage.
  */
 predicate isImmediatelyExecutedContainer(StmtContainer container) {
-  container instanceof TopLevel or
-
+  container instanceof TopLevel
+  or
   // Namespaces are immediately executed (they cannot be declared inside a function).
-  container instanceof NamespaceDeclaration or
-
+  container instanceof NamespaceDeclaration
+  or
   // IIFEs at the top-level are immediately executed
-  exists (ImmediatelyInvokedFunctionExpr function | container = function |
+  exists(ImmediatelyInvokedFunctionExpr function | container = function |
     not function.isAsync() and
     not function.isGenerator() and
-    isImmediatelyExecutedContainer(container.getEnclosingContainer()))
+    isImmediatelyExecutedContainer(container.getEnclosingContainer())
+  )
 }
 
 /**
  * Holds if the given import is only used to import type names, hence has no runtime effect.
  */
 predicate isAmbientImport(ImportDeclaration decl) {
-  decl.getFile().getFileType().isTypeScript()
-  and
-  exists (decl.getASpecifier())
-  and
-  not exists (decl.getASpecifier().getLocal().getVariable().getAnAccess())
+  decl.getFile().getFileType().isTypeScript() and
+  exists(decl.getASpecifier()) and
+  not exists(decl.getASpecifier().getLocal().getVariable().getAnAccess())
 }
 
 /**
@@ -52,7 +51,7 @@ Import getARuntimeImport(Module source, Module destination) {
 }
 
 predicate isImportedAtRuntime(Module source, Module destination) {
-  exists (getARuntimeImport(source, destination))
+  exists(getARuntimeImport(source, destination))
 }
 
 /**
@@ -65,7 +64,7 @@ predicate isImportedAtRuntime(Module source, Module destination) {
 class CandidateVarAccess extends VarAccess {
   CandidateVarAccess() {
     isImmediatelyExecutedContainer(getContainer()) and
-    not exists (ExportSpecifier spec | spec.getLocal() = this)
+    not exists(ExportSpecifier spec | spec.getLocal() = this)
   }
 }
 
@@ -75,7 +74,10 @@ class CandidateVarAccess extends VarAccess {
  * We use this to avoid duplicate alerts about the same underlying cyclic import.
  */
 VarAccess getFirstCandidateAccess(ImportDeclaration decl) {
-  result = min(decl.getASpecifier().getLocal().getVariable().getAnAccess().(CandidateVarAccess) as p order by p.getFirstToken().getIndex())
+  result = min(decl.getASpecifier().getLocal().getVariable().getAnAccess().(CandidateVarAccess) as p
+      order by
+        p.getFirstToken().getIndex()
+    )
 }
 
 /**
@@ -89,10 +91,9 @@ predicate cycleAlert(Module mod, ImportDeclaration import_, Module importedModul
   access = getFirstCandidateAccess(import_) and
   importedModule = import_.getImportedModule() and
   importedModule != mod and // don't report self-imports
-
   // Suppress warning if this is the unique importer of that module.
   // That's a sufficient and somewhat maintainable safety guarantee.
-  exists (Module otherEntry | isImportedAtRuntime(otherEntry, importedModule) and otherEntry != mod)
+  exists(Module otherEntry | isImportedAtRuntime(otherEntry, importedModule) and otherEntry != mod)
 }
 
 /** Holds if the length of the shortest sequence of runtime imports from `source` to `destination` is `steps`. */
@@ -104,9 +105,7 @@ predicate anyModule(Module m) { any() }
 /**
  * Gets the name of the module containing the given import.
  */
-string repr(Import import_) {
-  result = import_.getEnclosingModule().getName()
-}
+string repr(Import import_) { result = import_.getEnclosingModule().getName() }
 
 /**
  * Builds a string visualizing the shortest import path from `source` to `destination`, excluding
@@ -125,25 +124,32 @@ string repr(Import import_) {
  */
 string pathToModule(Module source, Module destination, int steps) {
   // Restrict paths to those that are relevant for building a path from the imported module of an alert back to the importer.
-  exists (Module m | cycleAlert(destination, _, m, _) and numberOfStepsToModule(m, source, _)) and
+  exists(Module m | cycleAlert(destination, _, m, _) and numberOfStepsToModule(m, source, _)) and
   numberOfStepsToModule(source, destination, steps) and
   (
     steps = 1 and
     result = repr(getARuntimeImport(source, destination))
     or
     steps > 1 and
-    exists (Module next |
+    exists(Module next |
       // Only extend the path to one of the potential successors, as we only need one example.
       next = min(Module mod |
-        isImportedAtRuntime(source, mod) and
-        numberOfStepsToModule(mod, destination, steps - 1) |
-        mod order by mod.getName()) and
-      result = repr(getARuntimeImport(source, next)) + " => " + pathToModule(next, destination, steps - 1))
+          isImportedAtRuntime(source, mod) and
+          numberOfStepsToModule(mod, destination, steps - 1)
+        |
+          mod
+          order by
+            mod.getName()
+        ) and
+      result = repr(getARuntimeImport(source, next)) + " => " +
+          pathToModule(next, destination, steps - 1)
+    )
   )
 }
 
 from Module mod, ImportDeclaration import_, Module importedModule, VarAccess access
 where cycleAlert(mod, import_, importedModule, access)
-select access, access.getName() + " is uninitialized if $@ is loaded first in the cyclic import:"
-  + " " + repr(import_) + " => " + min(pathToModule(importedModule, mod, _)) + " => " + repr(import_) + ".",
-  import_.getImportedPath(), importedModule.getName()
+select access,
+  access.getName() + " is uninitialized if $@ is loaded first in the cyclic import:" + " " +
+    repr(import_) + " => " + min(pathToModule(importedModule, mod, _)) + " => " + repr(import_) +
+    ".", import_.getImportedPath(), importedModule.getName()
diff --git a/javascript/ql/src/Declarations/UnusedParameter.qll b/javascript/ql/src/Declarations/UnusedParameter.qll
index eeceba9222fa..b4fb5cb578a7 100644
--- a/javascript/ql/src/Declarations/UnusedParameter.qll
+++ b/javascript/ql/src/Declarations/UnusedParameter.qll
@@ -4,13 +4,14 @@
  * In order to suppress alerts that are similar to the 'js/unused-parameter' alerts,
  * `isAnAccidentallyUnusedParameter` should be used since it holds iff that alert is active.
  */
+
 import javascript
 
 /**
  * Holds if `e` is an expression whose value is invoked as a function.
  */
 private predicate isCallee(Expr e) {
-  exists (InvokeExpr invk | e = invk.getCallee().getUnderlyingValue())
+  exists(InvokeExpr invk | e = invk.getCallee().getUnderlyingValue())
 }
 
 /**
@@ -23,12 +24,9 @@ private predicate isCallee(Expr e) {
  */
 private predicate isFirstOrder(Function f) {
   // if `f` is itself an expression, it is invoked
-  (f instanceof FunctionDeclStmt or isCallee(f))
-  and
+  (f instanceof FunctionDeclStmt or isCallee(f)) and
   // all references to `f` are also invocations
-  forall (VarAccess use | use = f.getVariable().getAnAccess() |
-    isCallee(use)
-  )
+  forall(VarAccess use | use = f.getVariable().getAnAccess() | isCallee(use))
 }
 
 /**
@@ -42,7 +40,7 @@ predicate isUnused(Function f, Parameter p, Variable pv, int i) {
   // nor could it be accessed through arguments
   not f.usesArgumentsObject() and
   // nor is it mentioned in a type
-  not exists (LocalVarTypeAccess acc | acc.getVariable() = pv) and
+  not exists(LocalVarTypeAccess acc | acc.getVariable() = pv) and
   // functions without a body cannot use their parameters
   f.hasBody() and
   // field parameters are used to initialize a field
@@ -59,16 +57,22 @@ predicate isUnused(Function f, Parameter p, Variable pv, int i) {
 predicate isAnAccidentallyUnusedParameter(Parameter p) {
   exists(Function f, Variable pv, int i |
     isUnused(f, p, pv, i) and
-    (// either f is first-order (so its parameter list is easy to adjust), or
-      isFirstOrder(f) or
+    (
+      // either f is first-order (so its parameter list is easy to adjust), or
+      isFirstOrder(f)
+      or
       // p is a destructuring parameter, or
-      not p instanceof SimpleParameter or
+      not p instanceof SimpleParameter
+      or
       // every later parameter is non-destructuring and also unused
-      forall (Parameter q, int j | q = f.getParameter(j) and j > i | isUnused(f, q.(SimpleParameter), _, _))) and
+      forall(Parameter q, int j | q = f.getParameter(j) and j > i |
+        isUnused(f, q.(SimpleParameter), _, _)
+      )
+    ) and
     // f is not an extern
     not f.inExternsFile() and
     // and p is not documented as being unused
-    not exists (JSDocParamTag parmdoc | parmdoc.getDocumentedParameter() = pv |
+    not exists(JSDocParamTag parmdoc | parmdoc.getDocumentedParameter() = pv |
       parmdoc.getDescription().toLowerCase().matches("%unused%")
     ) and
     // and f is not marked as abstract
@@ -76,7 +80,7 @@ predicate isAnAccidentallyUnusedParameter(Parameter p) {
     // this case is checked by a different query
     not f.(FunctionExpr).isSetter() and
     // `p` isn't used in combination with a rest property pattern to filter out unwanted properties
-    not exists (ObjectPattern op | exists(op.getRest()) |
+    not exists(ObjectPattern op | exists(op.getRest()) |
       op.getAPropertyPattern().getValuePattern() = pv.getADeclaration()
     )
   )
diff --git a/javascript/ql/src/Declarations/UnusedVariable.ql b/javascript/ql/src/Declarations/UnusedVariable.ql
index 5247e5b09bd8..aa361582c10c 100644
--- a/javascript/ql/src/Declarations/UnusedVariable.ql
+++ b/javascript/ql/src/Declarations/UnusedVariable.ql
@@ -33,8 +33,9 @@ class UnusedLocal extends LocalVariable {
  * contains externs declarations.
  */
 predicate mentionedInJSDocComment(UnusedLocal v) {
-  exists (Externs ext, JSDoc jsdoc |
-    ext = v.getADeclaration().getTopLevel() and jsdoc.getComment().getTopLevel() = ext |
+  exists(Externs ext, JSDoc jsdoc |
+    ext = v.getADeclaration().getTopLevel() and jsdoc.getComment().getTopLevel() = ext
+  |
     jsdoc.getComment().getText().regexpMatch("(?s).*\\b" + v.getName() + "\\b.*")
   )
 }
@@ -46,7 +47,7 @@ predicate mentionedInJSDocComment(UnusedLocal v) {
  * copies all properties of `o` into `props`, except for `x` which is copied into `v`.
  */
 predicate isPropertyFilter(UnusedLocal v) {
-  exists (ObjectPattern op | exists(op.getRest()) |
+  exists(ObjectPattern op | exists(op.getRest()) |
     op.getAPropertyPattern().getValuePattern() = v.getADeclaration()
   )
 }
@@ -57,14 +58,13 @@ predicate hasJsxInScope(UnusedLocal v) {
 
 /**
  * Holds if `v` is a "React" variable that is implicitly used by a JSX element.
-*/
+ */
 predicate isReactForJSX(UnusedLocal v) {
   hasJsxInScope(v) and
   (
     v.getName() = "React"
     or
-    exists(TopLevel tl |
-      tl = v.getADeclaration().getTopLevel() |
+    exists(TopLevel tl | tl = v.getADeclaration().getTopLevel() |
       // legacy `@jsx` pragmas
       exists(JSXPragma p | p.getTopLevel() = tl | p.getDOMName() = v.getName())
       or
@@ -81,50 +81,46 @@ predicate isReactForJSX(UnusedLocal v) {
  * Holds if `decl` is both a variable declaration and a type declaration,
  * and the declared type has a use.
  */
-predicate isUsedAsType(VarDecl decl) {
-  exists (decl.(TypeDecl).getLocalTypeName().getAnAccess())
-}
+predicate isUsedAsType(VarDecl decl) { exists(decl.(TypeDecl).getLocalTypeName().getAnAccess()) }
 
 /**
  * Holds if `decl` declares a local alias for a namespace that is used from inside a type.
  */
 predicate isUsedAsNamespace(VarDecl decl) {
-  exists (decl.(LocalNamespaceDecl).getLocalNamespaceName().getAnAccess())
+  exists(decl.(LocalNamespaceDecl).getLocalNamespaceName().getAnAccess())
 }
 
 /**
  * Holds if the given identifier belongs to a decorated class or enum.
  */
 predicate isDecorated(VarDecl decl) {
-  exists (ClassDefinition cd | cd.getIdentifier() = decl | exists(cd.getDecorator(_))) or
-  exists (EnumDeclaration cd | cd.getIdentifier() = decl | exists(cd.getDecorator(_)))
+  exists(ClassDefinition cd | cd.getIdentifier() = decl | exists(cd.getDecorator(_)))
+  or
+  exists(EnumDeclaration cd | cd.getIdentifier() = decl | exists(cd.getDecorator(_)))
 }
 
 /**
  * Holds if this is the name of an enum member.
  */
-predicate isEnumMember(VarDecl decl) {
-  decl = any(EnumMember member).getIdentifier()
-}
+predicate isEnumMember(VarDecl decl) { decl = any(EnumMember member).getIdentifier() }
 
 /**
  * Gets a description of the declaration `vd`, which is either of the form
  * "function f", "variable v" or "class c".
  */
 string describeVarDecl(VarDecl vd) {
-  if vd = any(Function f).getId() then
-    result = "function " + vd.getName()
-  else if vd = any(ClassDefinition c).getIdentifier() then
-    result = "class " + vd.getName()
+  if vd = any(Function f).getId()
+  then result = "function " + vd.getName()
   else
-    result = "variable " + vd.getName()
+    if vd = any(ClassDefinition c).getIdentifier()
+    then result = "class " + vd.getName()
+    else result = "variable " + vd.getName()
 }
 
 /**
  * An import statement that provides variable declarations.
  */
 class ImportVarDeclProvider extends Stmt {
-
   ImportVarDeclProvider() {
     this instanceof ImportDeclaration or
     this instanceof ImportEqualsDeclaration
@@ -145,7 +141,6 @@ class ImportVarDeclProvider extends Stmt {
     result = getAVarDecl().getVariable() and
     not whitelisted(result)
   }
-
 }
 
 /**
@@ -153,25 +148,32 @@ class ImportVarDeclProvider extends Stmt {
  */
 predicate whitelisted(UnusedLocal v) {
   // exclude variables mentioned in JSDoc comments in externs
-  mentionedInJSDocComment(v) or
+  mentionedInJSDocComment(v)
+  or
   // exclude variables used to filter out unwanted properties
-  isPropertyFilter(v) or
+  isPropertyFilter(v)
+  or
   // exclude imports of React that are implicitly referenced by JSX
-  isReactForJSX(v) or
+  isReactForJSX(v)
+  or
   // exclude names that are used as types
-  exists (VarDecl vd |
-    v = vd.getVariable() |
-    isUsedAsType(vd) or
+  exists(VarDecl vd | v = vd.getVariable() |
+    isUsedAsType(vd)
+    or
     // exclude names that are used as namespaces from inside a type
-    isUsedAsNamespace(vd)or
+    isUsedAsNamespace(vd)
+    or
     // exclude decorated functions and classes
-    isDecorated(vd) or
+    isDecorated(vd)
+    or
     // exclude names of enum members; they also define property names
-    isEnumMember(vd) or
+    isEnumMember(vd)
+    or
     // ignore ambient declarations - too noisy
     vd.isAmbient()
-  ) or
-  exists (DirectEval eval |
+  )
+  or
+  exists(DirectEval eval |
     // eval nearby
     eval.getEnclosingFunction() = v.getADeclaration().getEnclosingFunction() and
     // ... but not on the RHS
@@ -183,7 +185,7 @@ predicate whitelisted(UnusedLocal v) {
  * Holds if `vd` declares an unused variable that does not come from an import statement, as explained by `msg`.
  */
 predicate unusedNonImports(VarDecl vd, string msg) {
-  exists (UnusedLocal v |
+  exists(UnusedLocal v |
     v = vd.getVariable() and
     msg = "Unused " + describeVarDecl(vd) + "." and
     not vd = any(ImportVarDeclProvider p).getAVarDecl() and
@@ -195,7 +197,7 @@ predicate unusedNonImports(VarDecl vd, string msg) {
  * Holds if `provider` declares one or more unused variables, as explained by `msg`.
  */
 predicate unusedImports(ImportVarDeclProvider provider, string msg) {
-  exists (string imports, string names |
+  exists(string imports, string names |
     imports = pluralize("import", count(provider.getAnUnacceptableUnusedLocal())) and
     names = strictconcat(provider.getAnUnacceptableUnusedLocal().getName(), ", ") and
     msg = "Unused " + imports + " " + names + "."
@@ -203,6 +205,7 @@ predicate unusedImports(ImportVarDeclProvider provider, string msg) {
 }
 
 from ASTNode sel, string msg
-where unusedNonImports(sel, msg) or
-      unusedImports(sel, msg)
+where
+  unusedNonImports(sel, msg) or
+  unusedImports(sel, msg)
 select sel, msg
diff --git a/javascript/ql/src/Electron/AllowRunningInsecureContent.ql b/javascript/ql/src/Electron/AllowRunningInsecureContent.ql
index d9680985fbec..b6d1141cfcb4 100644
--- a/javascript/ql/src/Electron/AllowRunningInsecureContent.ql
+++ b/javascript/ql/src/Electron/AllowRunningInsecureContent.ql
@@ -9,10 +9,10 @@
  * @id js/enabling-electron-insecure-content
  */
 
-
 import javascript
 
 from DataFlow::PropWrite allowRunningInsecureContent, Electron::WebPreferences preferences
-where allowRunningInsecureContent = preferences.getAPropertyWrite("allowRunningInsecureContent")
-  and allowRunningInsecureContent.getRhs().mayHaveBooleanValue(true)
+where
+  allowRunningInsecureContent = preferences.getAPropertyWrite("allowRunningInsecureContent") and
+  allowRunningInsecureContent.getRhs().mayHaveBooleanValue(true)
 select allowRunningInsecureContent, "Enabling allowRunningInsecureContent is strongly discouraged."
diff --git a/javascript/ql/src/Electron/DisablingWebSecurity.ql b/javascript/ql/src/Electron/DisablingWebSecurity.ql
index 0653ab0ddbc3..792759d9cf68 100644
--- a/javascript/ql/src/Electron/DisablingWebSecurity.ql
+++ b/javascript/ql/src/Electron/DisablingWebSecurity.ql
@@ -12,6 +12,7 @@
 import javascript
 
 from DataFlow::PropWrite webSecurity, Electron::WebPreferences preferences
-where webSecurity = preferences.getAPropertyWrite("webSecurity")
-  and webSecurity.getRhs().mayHaveBooleanValue(false)
-select webSecurity, "Disabling webSecurity is strongly discouraged."
\ No newline at end of file
+where
+  webSecurity = preferences.getAPropertyWrite("webSecurity") and
+  webSecurity.getRhs().mayHaveBooleanValue(false)
+select webSecurity, "Disabling webSecurity is strongly discouraged."
diff --git a/javascript/ql/src/Electron/EnablingNodeIntegration.ql b/javascript/ql/src/Electron/EnablingNodeIntegration.ql
index d8e764012a20..e0ef84a20153 100644
--- a/javascript/ql/src/Electron/EnablingNodeIntegration.ql
+++ b/javascript/ql/src/Electron/EnablingNodeIntegration.ql
@@ -16,19 +16,19 @@ import javascript
  * Gets a warning message for `pref` if one of the `nodeIntegration` features is enabled.
  */
 string getNodeIntegrationWarning(Electron::WebPreferences pref) {
-	exists (string feature |
-		feature = "nodeIntegration" or
-		feature = "nodeIntegrationInWorker" |
-		pref.getAPropertyWrite(feature).getRhs().mayHaveBooleanValue(true) and
-		result = "The `" + feature + "` feature has been enabled."
-	)
-	or
-	exists (string feature |
-		feature = "nodeIntegration" |
-		not exists(pref.getAPropertyWrite(feature)) and
-		result = "The `" + feature + "` feature is enabled by default."
-	)
+  exists(string feature |
+    feature = "nodeIntegration" or
+    feature = "nodeIntegrationInWorker"
+  |
+    pref.getAPropertyWrite(feature).getRhs().mayHaveBooleanValue(true) and
+    result = "The `" + feature + "` feature has been enabled."
+  )
+  or
+  exists(string feature | feature = "nodeIntegration" |
+    not exists(pref.getAPropertyWrite(feature)) and
+    result = "The `" + feature + "` feature is enabled by default."
+  )
 }
 
 from Electron::WebPreferences preferences
-select preferences, getNodeIntegrationWarning(preferences)
\ No newline at end of file
+select preferences, getNodeIntegrationWarning(preferences)
diff --git a/javascript/ql/src/Expressions/BadParityCheck.ql b/javascript/ql/src/Expressions/BadParityCheck.ql
index c109c411ae4a..b725d20f0905 100644
--- a/javascript/ql/src/Expressions/BadParityCheck.ql
+++ b/javascript/ql/src/Expressions/BadParityCheck.ql
@@ -34,52 +34,76 @@ import javascript
  */
 predicate relevant(Expr e) {
   // base case: left operands of `%`
-  exists (ModExpr me | e = me.getLeftOperand()) or
+  exists(ModExpr me | e = me.getLeftOperand())
+  or
   // first inductive case: downward AST traversal
-  relevant(e.getParentExpr()) or
+  relevant(e.getParentExpr())
+  or
   // second inductive case: following variable assignments
-  exists (Variable v | relevant(v.getAnAccess()) | e = v.getAnAssignedExpr())
+  exists(Variable v | relevant(v.getAnAccess()) | e = v.getAnAssignedExpr())
 }
 
 /** Holds if `e` could evaluate to a negative number. */
 predicate maybeNegative(Expr e) {
   relevant(e) and
-  if exists(e.getIntValue()) then
-    e.getIntValue() < 0
-  else if e instanceof ParExpr then
-    maybeNegative(e.(ParExpr).getExpression())
-  else if e instanceof IncExpr then
-    maybeNegative(e.(IncExpr).getOperand())
-  else if e instanceof VarAccess then
-    maybeNegativeVar(e.(VarAccess).getVariable())
-  else if e instanceof AddExpr then
-    maybeNegative(e.(AddExpr).getAnOperand())
+  if exists(e.getIntValue())
+  then e.getIntValue() < 0
   else
-    // anything else is considered to possibly be negative
-    any()
+    if e instanceof ParExpr
+    then maybeNegative(e.(ParExpr).getExpression())
+    else
+      if e instanceof IncExpr
+      then maybeNegative(e.(IncExpr).getOperand())
+      else
+        if e instanceof VarAccess
+        then maybeNegativeVar(e.(VarAccess).getVariable())
+        else
+          if e instanceof AddExpr
+          then maybeNegative(e.(AddExpr).getAnOperand())
+          else
+            // anything else is considered to possibly be negative
+            any()
 }
 
 /** Holds if `v` could be assigned a negative number. */
 predicate maybeNegativeVar(Variable v) {
-  v.isGlobal() or v.isParameter() or
+  v.isGlobal()
+  or
+  v.isParameter()
+  or
   // is v ever assigned a potentially negative value?
-  maybeNegative(v.getAnAssignedExpr()) or
+  maybeNegative(v.getAnAssignedExpr())
+  or
   // is v ever decremented?
-  exists (DecExpr dec | dec.getOperand().getUnderlyingReference() = v.getAnAccess()) or
+  exists(DecExpr dec | dec.getOperand().getUnderlyingReference() = v.getAnAccess())
+  or
   // is v ever subject to a compound assignment other than +=, or to
   // += with potentially negative rhs?
-  exists (CompoundAssignExpr assgn | assgn.getTarget() = v.getAnAccess() |
+  exists(CompoundAssignExpr assgn | assgn.getTarget() = v.getAnAccess() |
     not assgn instanceof AssignAddExpr or
     maybeNegative(assgn.getRhs())
   )
 }
 
 from Comparison cmp, ModExpr me, int num, string parity
-where cmp.getAnOperand().stripParens() = me and
-      cmp.getAnOperand().getIntValue() = num and
-      me.getRightOperand().getIntValue() = 2 and
-      maybeNegative(me.getLeftOperand()) and
-      (((cmp instanceof EqExpr or cmp instanceof StrictEqExpr) and num = 1 and parity = "oddness") or
-       ((cmp instanceof NEqExpr or cmp instanceof StrictNEqExpr) and num = 1 and parity = "evenness") or
-       (cmp instanceof GTExpr and num = 0 and parity = "oddness"))
+where
+  cmp.getAnOperand().stripParens() = me and
+  cmp.getAnOperand().getIntValue() = num and
+  me.getRightOperand().getIntValue() = 2 and
+  maybeNegative(me.getLeftOperand()) and
+  (
+    (
+      (cmp instanceof EqExpr or cmp instanceof StrictEqExpr) and
+      num = 1 and
+      parity = "oddness"
+    )
+    or
+    (
+      (cmp instanceof NEqExpr or cmp instanceof StrictNEqExpr) and
+      num = 1 and
+      parity = "evenness"
+    )
+    or
+    (cmp instanceof GTExpr and num = 0 and parity = "oddness")
+  )
 select cmp, "Test for " + parity + " does not take negative numbers into account."
diff --git a/javascript/ql/src/Expressions/BitwiseSignCheck.ql b/javascript/ql/src/Expressions/BitwiseSignCheck.ql
index f3b615a1e89f..e28c6db2d914 100644
--- a/javascript/ql/src/Expressions/BitwiseSignCheck.ql
+++ b/javascript/ql/src/Expressions/BitwiseSignCheck.ql
@@ -20,7 +20,8 @@ import javascript
  */
 predicate acceptableSignCheck(BitwiseExpr b) {
   // projecting out constant bit patterns not containing the sign bit is fine
-  b.(BitAndExpr).getRightOperand().getIntValue() <= 2147483647 or
+  b.(BitAndExpr).getRightOperand().getIntValue() <= 2147483647
+  or
   /*
    * `| 0` and `0 |` are popular ways of converting a value to an integer;
    * `>> 0`, `<< 0`, `^ 0` and `0 ^` achieve the same effect;
@@ -28,23 +29,28 @@ predicate acceptableSignCheck(BitwiseExpr b) {
    * so any binary bitwise operation involving zero is acceptable, _except_ for `x >>> 0`,
    * which amounts to a cast to unsigned int
    */
-  exists (int i |
+
+  exists(int i |
     b.(BinaryExpr).getChildExpr(i).getIntValue() = 0 and
     not (b instanceof URShiftExpr and i = 1)
-  ) or
+  )
+  or
   /*
    * `<< 16 >> 16` is how Emscripten converts values to short integers; since this
    * is sign-preserving, we shouldn't flag it (and we allow arbitrary shifts, not just 16-bit ones)
    */
-  exists (RShiftExpr rsh, LShiftExpr lsh |
-    rsh = b and lsh = rsh.getLeftOperand().getUnderlyingValue() and
+
+  exists(RShiftExpr rsh, LShiftExpr lsh |
+    rsh = b and
+    lsh = rsh.getLeftOperand().getUnderlyingValue() and
     lsh.getRightOperand().getIntValue() = rsh.getRightOperand().getIntValue()
   )
 }
 
 from Comparison e, BitwiseExpr b
-where b = e.getLeftOperand().getUnderlyingValue() and
-      not e instanceof EqualityTest and
-      e.getRightOperand().getIntValue() = 0 and
-      not acceptableSignCheck(b)
-select e, "Sign check of a bitwise operation"
\ No newline at end of file
+where
+  b = e.getLeftOperand().getUnderlyingValue() and
+  not e instanceof EqualityTest and
+  e.getRightOperand().getIntValue() = 0 and
+  not acceptableSignCheck(b)
+select e, "Sign check of a bitwise operation"
diff --git a/javascript/ql/src/Expressions/Clones.qll b/javascript/ql/src/Expressions/Clones.qll
index 54a996717717..cc68defb23cc 100644
--- a/javascript/ql/src/Expressions/Clones.qll
+++ b/javascript/ql/src/Expressions/Clones.qll
@@ -9,12 +9,16 @@ import javascript
  */
 private int kindOf(ASTNode nd) {
   // map expression kinds to even non-negative numbers
-  result = nd.(Expr).getKind() * 2 or
+  result = nd.(Expr).getKind() * 2
+  or
   // map statement kinds to odd non-negative numbers
-  result = nd.(Stmt).getKind() * 2 + 1 or
+  result = nd.(Stmt).getKind() * 2 + 1
+  or
   // other node types get negative kinds
-  nd instanceof TopLevel and result = -1 or
-  nd instanceof Property and result = -2 or
+  nd instanceof TopLevel and result = -1
+  or
+  nd instanceof Property and result = -2
+  or
   nd instanceof ClassDefinition and result = -3
 }
 
@@ -57,8 +61,8 @@ abstract class StructurallyCompared extends ASTNode {
   ASTNode candidateInternal() {
     // in order to correspond, nodes need to have the same kind and shape
     exists(int kind, int numChildren | kindAndArity(this, kind, numChildren) |
-      result = candidateKind(kind, numChildren) 
-      or 
+      result = candidateKind(kind, numChildren)
+      or
       result = uncleKind(kind, numChildren)
     )
   }
@@ -68,7 +72,7 @@ abstract class StructurallyCompared extends ASTNode {
    * where this node is the `i`th child of its parent.
    */
   private ASTNode getAStructuralUncle(int i) {
-    exists (StructurallyCompared parent | this = parent.getChild(i) |
+    exists(StructurallyCompared parent | this = parent.getChild(i) |
       result = parent.candidateInternal()
     )
   }
@@ -79,7 +83,8 @@ abstract class StructurallyCompared extends ASTNode {
 
   pragma[noinline]
   private ASTNode uncleKind(int kind, int numChildren) {
-    exists(int i | result = getAStructuralUncle(i).getChild(i)) and kindAndArity(result, kind, numChildren)
+    exists(int i | result = getAStructuralUncle(i).getChild(i)) and
+    kindAndArity(result, kind, numChildren)
   }
 
   /**
@@ -89,20 +94,24 @@ abstract class StructurallyCompared extends ASTNode {
    */
   private predicate sameInternal(ASTNode that) {
     that = this.candidateInternal() and
-
-    /* Check that `this` and `that` bind to the same variable, if any.
+    /*
+     * Check that `this` and `that` bind to the same variable, if any.
      * Note that it suffices to check the implication one way: since we restrict
      * `this` and `that` to be of the same kind and in the same syntactic
-     * position, either both bind to a variable or neither does. */
+     * position, either both bind to a variable or neither does.
+     */
+
     (bind(this, _) implies exists(Variable v | bind(this, v) and bind(that, v))) and
+    /*
+     * Check that `this` and `that` have the same constant value, if any.
+     * As above, it suffices to check one implication.
+     */
 
-    /* Check that `this` and `that` have the same constant value, if any.
-     * As above, it suffices to check one implication. */
     (exists(valueOf(this)) implies valueOf(this) = valueOf(that)) and
-
-    forall (StructurallyCompared child, int i |
-       child = getChild(i) and that = child.getAStructuralUncle(i) |
-       child.sameInternal(that.getChild(i))
+    forall(StructurallyCompared child, int i |
+      child = getChild(i) and that = child.getAStructuralUncle(i)
+    |
+      child.sameInternal(that.getChild(i))
     )
   }
 
@@ -121,9 +130,7 @@ abstract class StructurallyCompared extends ASTNode {
  * A child of a node that is subject to structural comparison.
  */
 private class InternalCandidate extends StructurallyCompared {
-  InternalCandidate() {
-    exists (getParent().(StructurallyCompared).candidateInternal())
-  }
+  InternalCandidate() { exists(getParent().(StructurallyCompared).candidateInternal()) }
 
   override ASTNode candidate() { none() }
 }
@@ -133,13 +140,9 @@ private class InternalCandidate extends StructurallyCompared {
  * structurally identical.
  */
 class OperandComparedToSelf extends StructurallyCompared {
-  OperandComparedToSelf() {
-    exists (Comparison comp | this = comp.getLeftOperand())
-  }
+  OperandComparedToSelf() { exists(Comparison comp | this = comp.getLeftOperand()) }
 
-  override Expr candidate() {
-    result = getParent().(Comparison).getRightOperand()
-  }
+  override Expr candidate() { result = getParent().(Comparison).getRightOperand() }
 }
 
 /**
@@ -147,20 +150,14 @@ class OperandComparedToSelf extends StructurallyCompared {
  * structurally identical.
  */
 class SelfAssignment extends StructurallyCompared {
-  SelfAssignment() {
-    exists (AssignExpr assgn | this = assgn.getLhs())
-  }
+  SelfAssignment() { exists(AssignExpr assgn | this = assgn.getLhs()) }
 
-  override Expr candidate() {
-    result = getAssignment().getRhs()
-  }
+  override Expr candidate() { result = getAssignment().getRhs() }
 
   /**
    * Gets the enclosing assignment.
    */
-  AssignExpr getAssignment() {
-    result.getLhs() = this
-  }
+  AssignExpr getAssignment() { result.getLhs() = this }
 }
 
 /**
@@ -169,14 +166,14 @@ class SelfAssignment extends StructurallyCompared {
  */
 class DuplicatePropertyInitDetector extends StructurallyCompared {
   DuplicatePropertyInitDetector() {
-    exists (ObjectExpr oe, string p |
+    exists(ObjectExpr oe, string p |
       this = oe.getPropertyByName(p).getInit() and
       oe.getPropertyByName(p) != oe.getPropertyByName(p)
     )
   }
 
   override Expr candidate() {
-    exists (ObjectExpr oe, string p |
+    exists(ObjectExpr oe, string p |
       this = oe.getPropertyByName(p).getInit() and
       result = oe.getPropertyByName(p).getInit() and
       result != this
diff --git a/javascript/ql/src/Expressions/CompareIdenticalValues.ql b/javascript/ql/src/Expressions/CompareIdenticalValues.ql
index 3bf1999f0052..9ad25e5ab107 100644
--- a/javascript/ql/src/Expressions/CompareIdenticalValues.ql
+++ b/javascript/ql/src/Expressions/CompareIdenticalValues.ql
@@ -26,10 +26,11 @@ predicate accessWithConversions(Expr e, Variable v) {
   or
   accessWithConversions(e.(ParExpr).getExpression(), v)
   or
-  exists (UnaryExpr ue | ue instanceof NegExpr or ue instanceof PlusExpr |
+  exists(UnaryExpr ue | ue instanceof NegExpr or ue instanceof PlusExpr |
     ue = e and accessWithConversions(ue.getOperand(), v)
-  ) or
-  exists (CallExpr ce | ce = e |
+  )
+  or
+  exists(CallExpr ce | ce = e |
     ce = DataFlow::globalVarRef("Number").getACall().asExpr() and
     ce.getNumArgument() = 1 and
     accessWithConversions(ce.getArgument(0), v)
@@ -57,26 +58,28 @@ predicate isNaNComment(Comment c, string filePath, int startLine) {
  *     one line away in either direction) that contains the word `NaN`.
  */
 predicate isNaNCheck(EqualityTest eq) {
-  exists (Variable v |
+  exists(Variable v |
     accessWithConversions(eq.getLeftOperand(), v) and
-    accessWithConversions(eq.getRightOperand(), v) |
-
+    accessWithConversions(eq.getRightOperand(), v)
+  |
     // `v` is a parameter of the enclosing function, which is called `isNaN`
-    exists (Function isNaN |
+    exists(Function isNaN |
       isNaN = eq.getEnclosingFunction() and
       isNaN.getName().toLowerCase() = "isnan" and
       v = isNaN.getAParameter().getAVariable()
-    ) or
-
+    )
+    or
     // there is a comment containing the word "NaN" next to the comparison
-    exists (string f, int l |
+    exists(string f, int l |
       eq.getLocation().hasLocationInfo(f, l, _, _, _) and
-      isNaNComment(_, f, [l-1..l+1])
+      isNaNComment(_, f, [l - 1 .. l + 1])
     )
   )
 }
 
 from Comparison selfComparison, OperandComparedToSelf e
-where e = selfComparison.getAnOperand() and e.same(_) and
-      not isNaNCheck(selfComparison)
+where
+  e = selfComparison.getAnOperand() and
+  e.same(_) and
+  not isNaNCheck(selfComparison)
 select selfComparison, "This expression compares $@ to itself.", e, e.toString()
diff --git a/javascript/ql/src/Expressions/ComparisonWithNaN.ql b/javascript/ql/src/Expressions/ComparisonWithNaN.ql
index 4ffd8b539b68..e77b16af65ed 100644
--- a/javascript/ql/src/Expressions/ComparisonWithNaN.ql
+++ b/javascript/ql/src/Expressions/ComparisonWithNaN.ql
@@ -15,5 +15,5 @@
 import javascript
 
 from Comparison cmp
-where ((GlobalVarAccess)cmp.getAnOperand()).getName() = "NaN"
-select cmp, "Useless comparison with NaN."
\ No newline at end of file
+where (cmp.getAnOperand().(GlobalVarAccess)).getName() = "NaN"
+select cmp, "Useless comparison with NaN."
diff --git a/javascript/ql/src/Expressions/DOMProperties.qll b/javascript/ql/src/Expressions/DOMProperties.qll
index 9ed6db0e4c15..7ff1884fb1b4 100644
--- a/javascript/ql/src/Expressions/DOMProperties.qll
+++ b/javascript/ql/src/Expressions/DOMProperties.qll
@@ -6,15 +6,13 @@ import semmle.javascript.Externs
 
 /** Holds if `et` is a root interface of the DOM type hierarchy. */
 predicate isDOMRootType(ExternalType et) {
-  exists (string n | n = et.getName() |
-    n = "EventTarget" or n = "StyleSheet"
-  )
+  exists(string n | n = et.getName() | n = "EventTarget" or n = "StyleSheet")
 }
 
 /** Holds if `p` is declared as a property of a DOM class or interface. */
 pragma[nomagic]
 predicate isDOMProperty(string p) {
-  exists (ExternalMemberDecl emd | emd.getName() = p |
+  exists(ExternalMemberDecl emd | emd.getName() = p |
     isDOMRootType(emd.getDeclaringType().getASupertype*())
   )
 }
diff --git a/javascript/ql/src/Expressions/DuplicateCondition.ql b/javascript/ql/src/Expressions/DuplicateCondition.ql
index 02872ae16dcc..a13a0f158104 100644
--- a/javascript/ql/src/Expressions/DuplicateCondition.ql
+++ b/javascript/ql/src/Expressions/DuplicateCondition.ql
@@ -15,20 +15,19 @@ import Clones
 
 /** Gets the `i`th condition in the `if`-`else if` chain starting at `stmt`. */
 Expr getCondition(IfStmt stmt, int i) {
-  i = 0 and result = stmt.getCondition() or
-  result = getCondition(stmt.getElse(), i-1)
+  i = 0 and result = stmt.getCondition()
+  or
+  result = getCondition(stmt.getElse(), i - 1)
 }
 
 /**
  * A detector for duplicated `if` conditions in the same `if`-`else if` chain.
  */
 class DuplicateIfCondition extends StructurallyCompared {
-  DuplicateIfCondition() {
-    this = getCondition(_, 0)
-  }
+  DuplicateIfCondition() { this = getCondition(_, 0) }
 
   override Expr candidate() {
-    exists (IfStmt stmt, int j | this = getCondition(stmt, 0) |
+    exists(IfStmt stmt, int j | this = getCondition(stmt, 0) |
       j > 0 and result = getCondition(stmt, j)
     )
   }
@@ -36,4 +35,4 @@ class DuplicateIfCondition extends StructurallyCompared {
 
 from DuplicateIfCondition e, Expr f
 where e.same(f)
-select f, "This condition is a duplicate of $@.", e, e.toString()
\ No newline at end of file
+select f, "This condition is a duplicate of $@.", e, e.toString()
diff --git a/javascript/ql/src/Expressions/DuplicateProperty.ql b/javascript/ql/src/Expressions/DuplicateProperty.ql
index f012839f8fe9..686241068813 100644
--- a/javascript/ql/src/Expressions/DuplicateProperty.ql
+++ b/javascript/ql/src/Expressions/DuplicateProperty.ql
@@ -12,11 +12,13 @@
 
 import Clones
 
-from ObjectExpr oe, int i, int j, Property p, Property q,
-     DuplicatePropertyInitDetector dpid
-where p = oe.getProperty(i) and q = oe.getProperty(j) and dpid = p.getInit() and
-      dpid.same(q.getInit()) and
-      i < j and
-      // only report the next duplicate
-      not exists (int mid | mid in [i+1..j-1] | dpid.same(oe.getProperty(mid).getInit()))
-select p, "This property is duplicated $@.", q, "here"
\ No newline at end of file
+from ObjectExpr oe, int i, int j, Property p, Property q, DuplicatePropertyInitDetector dpid
+where
+  p = oe.getProperty(i) and
+  q = oe.getProperty(j) and
+  dpid = p.getInit() and
+  dpid.same(q.getInit()) and
+  i < j and
+  // only report the next duplicate
+  not exists(int mid | mid in [i + 1 .. j - 1] | dpid.same(oe.getProperty(mid).getInit()))
+select p, "This property is duplicated $@.", q, "here"
diff --git a/javascript/ql/src/Expressions/DuplicateSwitchCase.ql b/javascript/ql/src/Expressions/DuplicateSwitchCase.ql
index 57a04fcaf3e8..56cb848dba14 100644
--- a/javascript/ql/src/Expressions/DuplicateSwitchCase.ql
+++ b/javascript/ql/src/Expressions/DuplicateSwitchCase.ql
@@ -17,12 +17,10 @@ import Clones
  * A clone detector for finding structurally identical case labels.
  */
 class DuplicateSwitchCase extends StructurallyCompared {
-  DuplicateSwitchCase() {
-    exists (Case c | this = c.getExpr())
-  }
+  DuplicateSwitchCase() { exists(Case c | this = c.getExpr()) }
 
   override Expr candidate() {
-    exists (SwitchStmt s, int i, int j |
+    exists(SwitchStmt s, int i, int j |
       this = s.getCase(i).getExpr() and
       result = s.getCase(j).getExpr() and
       i < j
@@ -32,4 +30,4 @@ class DuplicateSwitchCase extends StructurallyCompared {
 
 from DuplicateSwitchCase e, Expr f
 where e.same(f)
-select f, "This case label is a duplicate of $@.", e, e.toString()
\ No newline at end of file
+select f, "This case label is a duplicate of $@.", e, e.toString()
diff --git a/javascript/ql/src/Expressions/ExprHasNoEffect.ql b/javascript/ql/src/Expressions/ExprHasNoEffect.ql
index 49dbfc53fef2..ae784950e237 100644
--- a/javascript/ql/src/Expressions/ExprHasNoEffect.ql
+++ b/javascript/ql/src/Expressions/ExprHasNoEffect.ql
@@ -21,27 +21,34 @@ import semmle.javascript.RestrictedLocations
  * Holds if `e` appears in a syntactic context where its value is discarded.
  */
 predicate inVoidContext(Expr e) {
-  exists (ExprStmt parent |
+  exists(ExprStmt parent |
     // e is a toplevel expression in an expression statement
     parent = e.getParent() and
     // but it isn't an HTML attribute or a configuration object
-    not exists (TopLevel tl | tl = parent.getParent() |
-      tl instanceof CodeInAttribute or
+    not exists(TopLevel tl | tl = parent.getParent() |
+      tl instanceof CodeInAttribute
+      or
       // if the toplevel in its entirety is of the form `({ ... })`,
       // it is probably a configuration object (e.g., a require.js build configuration)
       (tl.getNumChildStmt() = 1 and e.stripParens() instanceof ObjectExpr)
     )
-  ) or
-  exists (SeqExpr seq, int i, int n |
+  )
+  or
+  exists(SeqExpr seq, int i, int n |
     e = seq.getOperand(i) and
-    n = seq.getNumOperands() |
-    i < n-1 or inVoidContext(seq)
-  ) or
-  exists (ForStmt stmt | e = stmt.getUpdate()) or
-  exists (ForStmt stmt | e = stmt.getInit() |
+    n = seq.getNumOperands()
+  |
+    i < n - 1 or inVoidContext(seq)
+  )
+  or
+  exists(ForStmt stmt | e = stmt.getUpdate())
+  or
+  exists(ForStmt stmt | e = stmt.getInit() |
     // Allow the pattern `for(i; i < 10; i++)`
-    not e instanceof VarAccess) or
-  exists (LogicalBinaryExpr logical | e = logical.getRightOperand() and inVoidContext(logical))
+    not e instanceof VarAccess
+  )
+  or
+  exists(LogicalBinaryExpr logical | e = logical.getRightOperand() and inVoidContext(logical))
 }
 
 /**
@@ -54,7 +61,7 @@ predicate inVoidContext(Expr e) {
  */
 predicate isDeclaration(Expr e) {
   (e instanceof VarAccess or e instanceof PropAccess) and
-  exists (e.getParent().(ExprStmt).getDocumentation().getATag())
+  exists(e.getParent().(ExprStmt).getDocumentation().getATag())
 }
 
 /**
@@ -63,24 +70,23 @@ predicate isDeclaration(Expr e) {
 predicate isGetterProperty(string name) {
   // there is a call of the form `Object.defineProperty(..., name, { get: ..., ... })`
   // or `Object.defineProperty(..., name, <something that's not an object literal>)`
-  exists (CallToObjectDefineProperty defProp |
+  exists(CallToObjectDefineProperty defProp |
     name = defProp.getPropertyName() and
-    exists (Expr descriptor | descriptor = defProp.getPropertyDescriptor().asExpr() |
+    exists(Expr descriptor | descriptor = defProp.getPropertyDescriptor().asExpr() |
       exists(descriptor.(ObjectExpr).getPropertyByName("get")) or
       not descriptor instanceof ObjectExpr
     )
-  ) or
+  )
+  or
   // there is an object expression with a getter property `name`
-  exists (ObjectExpr obj | obj.getPropertyByName(name) instanceof PropertyGetter)
+  exists(ObjectExpr obj | obj.getPropertyByName(name) instanceof PropertyGetter)
 }
 
 /**
  * A property access that may invoke a getter.
  */
 class GetterPropertyAccess extends PropAccess {
-  override predicate isImpure() {
-    isGetterProperty(getPropertyName())
-  }
+  override predicate isImpure() { isGetterProperty(getPropertyName()) }
 }
 
 /**
@@ -89,7 +95,7 @@ class GetterPropertyAccess extends PropAccess {
  * exists to prevent the call from being interpreted as a direct eval.
  */
 predicate isIndirectEval(CallExpr c, Expr dummy) {
-  exists (SeqExpr seq | seq = c.getCallee().stripParens() |
+  exists(SeqExpr seq | seq = c.getCallee().stripParens() |
     dummy = seq.getOperand(0) and
     seq.getOperand(1).(GlobalVarAccess).getName() = "eval" and
     seq.getNumOperands() = 2
@@ -102,7 +108,7 @@ predicate isIndirectEval(CallExpr c, Expr dummy) {
  * to prevent the call from being interpreted as a method call.
  */
 predicate isReceiverSuppressingCall(CallExpr c, Expr dummy, PropAccess callee) {
-  exists (SeqExpr seq | seq = c.getCallee().stripParens() |
+  exists(SeqExpr seq | seq = c.getCallee().stripParens() |
     dummy = seq.getOperand(0) and
     seq.getOperand(1) = callee and
     seq.getNumOperands() = 2
@@ -121,32 +127,34 @@ predicate noSideEffects(Expr e) {
   e.isPure()
   or
   // `new Error(...)`, `new SyntaxError(...)`, etc.
-  forex (Function f | f = e.flow().(DataFlow::NewNode).getACallee() |
+  forex(Function f | f = e.flow().(DataFlow::NewNode).getACallee() |
     f.(ExternalType).getASupertype*().getName() = "Error"
   )
 }
 
 from Expr e
-where noSideEffects(e) and inVoidContext(e) and
-      // disregard pure expressions wrapped in a void(...)
-      not e instanceof VoidExpr and
-      // filter out directives (unknown directives are handled by UnknownDirective.ql)
-      not exists (Directive d | e = d.getExpr()) and
-      // or about externs
-      not e.inExternsFile() and
-      // don't complain about declarations
-      not isDeclaration(e) and
-      // exclude DOM properties, which sometimes have magical auto-update properties
-      not isDOMProperty(e.(PropAccess).getPropertyName()) and
-      // exclude xUnit.js annotations
-      not e instanceof XUnitAnnotation and
-      // exclude common patterns that are most likely intentional
-      not isIndirectEval(_, e) and
-      not isReceiverSuppressingCall(_, e, _) and
-      // exclude anonymous function expressions as statements; these can only arise
-      // from a syntax error we already flag
-      not exists (FunctionExpr fe, ExprStmt es | fe = e |
-        fe = es.getExpr() and
-        not exists(fe.getName())
-      )
-select (FirstLineOf)e, "This expression has no effect."
+where
+  noSideEffects(e) and
+  inVoidContext(e) and
+  // disregard pure expressions wrapped in a void(...)
+  not e instanceof VoidExpr and
+  // filter out directives (unknown directives are handled by UnknownDirective.ql)
+  not exists(Directive d | e = d.getExpr()) and
+  // or about externs
+  not e.inExternsFile() and
+  // don't complain about declarations
+  not isDeclaration(e) and
+  // exclude DOM properties, which sometimes have magical auto-update properties
+  not isDOMProperty(e.(PropAccess).getPropertyName()) and
+  // exclude xUnit.js annotations
+  not e instanceof XUnitAnnotation and
+  // exclude common patterns that are most likely intentional
+  not isIndirectEval(_, e) and
+  not isReceiverSuppressingCall(_, e, _) and
+  // exclude anonymous function expressions as statements; these can only arise
+  // from a syntax error we already flag
+  not exists(FunctionExpr fe, ExprStmt es | fe = e |
+    fe = es.getExpr() and
+    not exists(fe.getName())
+  )
+select e.(FirstLineOf), "This expression has no effect."
diff --git a/javascript/ql/src/Expressions/HapaxLegomenon.ql b/javascript/ql/src/Expressions/HapaxLegomenon.ql
index ecf5df42f62d..b60312706eb0 100644
--- a/javascript/ql/src/Expressions/HapaxLegomenon.ql
+++ b/javascript/ql/src/Expressions/HapaxLegomenon.ql
@@ -15,13 +15,16 @@ import javascript
 
 /** Gets the number of identifiers and string literals that refer to `name`. */
 int countOccurrences(string name) {
-  (exists (PropAccess pacc | name = pacc.getPropertyName()) or
-   exists (VarAccess acc | name = acc.getName())) and
-   result = strictcount(Expr id |
-     id.(Identifier).getName() = name or
-     // count string literals as well to capture meta-programming
-     id.(ConstantString).getStringValue() = name
-   )
+  (
+    exists(PropAccess pacc | name = pacc.getPropertyName()) or
+    exists(VarAccess acc | name = acc.getName())
+  ) and
+  result = strictcount(Expr id |
+      id.(Identifier).getName() = name
+      or
+      // count string literals as well to capture meta-programming
+      id.(ConstantString).getStringValue() = name
+    )
 }
 
 /**
@@ -33,7 +36,7 @@ abstract class Hapax extends @expr {
   abstract string getName();
 
   /** Gets a textual representation of this element. */
-  string toString() { result = ((Expr)this).toString() }
+  string toString() { result = (this.(Expr)).toString() }
 }
 
 /**
@@ -42,14 +45,10 @@ abstract class Hapax extends @expr {
  */
 class UndeclaredPropertyAccess extends Hapax, @dotexpr {
   UndeclaredPropertyAccess() {
-    exists (string name | name = this.(DotExpr).getPropertyName() |
-      countOccurrences(name) = 1
-      and
-      not exists (JSLintProperties jslpd |
-        jslpd.appliesTo(this) and jslpd.getAProperty() = name
-      )
-      and
-      not exists (ExternalMemberDecl emd | emd.getProperty() = this)
+    exists(string name | name = this.(DotExpr).getPropertyName() |
+      countOccurrences(name) = 1 and
+      not exists(JSLintProperties jslpd | jslpd.appliesTo(this) and jslpd.getAProperty() = name) and
+      not exists(ExternalMemberDecl emd | emd.getProperty() = this)
     )
   }
 
@@ -62,12 +61,10 @@ class UndeclaredPropertyAccess extends Hapax, @dotexpr {
  */
 class UndeclaredGlobal extends Hapax, @varaccess {
   UndeclaredGlobal() {
-    exists (GlobalVariable gv, string name | this = gv.getAnAccess() and name = gv.getName() |
+    exists(GlobalVariable gv, string name | this = gv.getAnAccess() and name = gv.getName() |
       countOccurrences(name) = 1 and
-      not exists (Linting::GlobalDeclaration glob |
-        glob.declaresGlobalForAccess(this)
-      ) and
-      not exists (gv.getADeclaration())
+      not exists(Linting::GlobalDeclaration glob | glob.declaresGlobalForAccess(this)) and
+      not exists(gv.getADeclaration())
     )
   }
 
@@ -79,7 +76,7 @@ class UndeclaredGlobal extends Hapax, @varaccess {
  * except for capitalization, ensuring that it occurs at least twice.
  */
 int candidateSpellingCount(Hapax hapax, string m) {
-  exists (string n | n = hapax.getName() |
+  exists(string n | n = hapax.getName() |
     m.toLowerCase() = n.toLowerCase() and
     m != n and
     result = countOccurrences(m) and
@@ -88,6 +85,7 @@ int candidateSpellingCount(Hapax hapax, string m) {
 }
 
 from Hapax hapax, string n, string m
-where n = hapax.getName() and
-      candidateSpellingCount(hapax, m) = max(candidateSpellingCount(hapax, _))
-select (Expr)hapax, "'" + n + "' is mentioned only once; it may be a typo for '" + m + "'."
+where
+  n = hapax.getName() and
+  candidateSpellingCount(hapax, m) = max(candidateSpellingCount(hapax, _))
+select hapax.(Expr), "'" + n + "' is mentioned only once; it may be a typo for '" + m + "'."
diff --git a/javascript/ql/src/Expressions/HeterogeneousComparison.ql b/javascript/ql/src/Expressions/HeterogeneousComparison.ql
index ae1be5a7a989..3f1eb083a4a3 100644
--- a/javascript/ql/src/Expressions/HeterogeneousComparison.ql
+++ b/javascript/ql/src/Expressions/HeterogeneousComparison.ql
@@ -25,8 +25,11 @@ private import semmle.javascript.DefensiveProgramming
  * with the switched-on expression being the right operand and all case labels the left operands.
  */
 predicate comparisonOperands(ASTNode nd, Expr left, Expr right) {
-  exists (Comparison cmp | cmp = nd | left = cmp.getLeftOperand() and right = cmp.getRightOperand()) or
-  exists (SwitchStmt switch | switch = nd | right = switch.getExpr() and left = switch.getACase().getExpr())
+  exists(Comparison cmp | cmp = nd | left = cmp.getLeftOperand() and right = cmp.getRightOperand())
+  or
+  exists(SwitchStmt switch | switch = nd |
+    right = switch.getExpr() and left = switch.getACase().getExpr()
+  )
 }
 
 /**
@@ -34,7 +37,7 @@ predicate comparisonOperands(ASTNode nd, Expr left, Expr right) {
  */
 predicate hasImplicitConversionMethod(DefiniteAbstractValue av) {
   // look for assignments to `toString` or `valueOf` on `av` or its prototypes
-  exists (AnalyzedPropertyWrite apw, string p | p = "toString" or p = "valueOf" |
+  exists(AnalyzedPropertyWrite apw, string p | p = "toString" or p = "valueOf" |
     apw.writes(av.getAPrototype*(), p, _)
   )
 }
@@ -44,10 +47,10 @@ predicate hasImplicitConversionMethod(DefiniteAbstractValue av) {
  */
 InferredType strictEqualityOperandType(ASTNode eq, DataFlow::AnalyzedNode operand) {
   // strict equality tests do no conversion at all
-  operand.asExpr() = eq.(StrictEqualityTest).getAChildExpr() and result = operand.getAType() or
-
+  operand.asExpr() = eq.(StrictEqualityTest).getAChildExpr() and result = operand.getAType()
+  or
   // switch behaves like a strict equality test
-  exists (SwitchStmt switch | switch = eq |
+  exists(SwitchStmt switch | switch = eq |
     (operand.asExpr() = switch.getExpr() or operand.asExpr() = switch.getACase().getExpr()) and
     result = operand.getAType()
   )
@@ -70,7 +73,7 @@ predicate implicitlyConvertedOperand(ASTNode parent, DataFlow::AnalyzedNode oper
 InferredType nonStrictOperandType(ASTNode parent, DataFlow::AnalyzedNode operand) {
   // non-strict equality tests perform conversions
   operand.asExpr() = parent.(NonStrictEqualityTest).getAChildExpr() and
-  exists (InferredType tp | tp = operand.getAValue().getType() |
+  exists(InferredType tp | tp = operand.getAValue().getType() |
     result = tp
     or
     // Booleans are converted to numbers
@@ -95,7 +98,7 @@ InferredType nonStrictOperandType(ASTNode parent, DataFlow::AnalyzedNode operand
   or
   // relational operators convert their operands to numbers or strings
   operand.asExpr() = parent.(RelationalComparison).getAChildExpr() and
-  exists (AbstractValue v | v = operand.getAValue() |
+  exists(AbstractValue v | v = operand.getAValue() |
     result = v.getType()
     or
     v.isCoercibleToNumber() and result = TTNumber()
@@ -121,11 +124,14 @@ InferredType convertedOperandType(ASTNode parent, DataFlow::AnalyzedNode operand
  * `leftTypes` and `rightTypes`, respectively, but there is no
  * common type they coerce to.
  */
-predicate isHeterogeneousComparison(ASTNode cmp, DataFlow::AnalyzedNode left, DataFlow::AnalyzedNode right,
-                                    string leftTypes, string rightTypes) {
+predicate isHeterogeneousComparison(
+  ASTNode cmp, DataFlow::AnalyzedNode left, DataFlow::AnalyzedNode right, string leftTypes,
+  string rightTypes
+) {
   comparisonOperands(cmp, left.asExpr(), right.asExpr()) and
   not convertedOperandType(cmp, left) = convertedOperandType(cmp, right) and
-  leftTypes = left.ppTypes() and rightTypes = right.ppTypes()
+  leftTypes = left.ppTypes() and
+  rightTypes = right.ppTypes()
 }
 
 /**
@@ -141,11 +147,8 @@ predicate isPseudoKeyword(string name) {
  * Gets a user friendly description of `e`, if such a description exists.
  */
 string getDescription(VarAccess e) {
-  exists (string name | name = e.getName() |
-    if isPseudoKeyword(name) then
-      result = "'" + name + "'"
-    else
-      result  = "variable '" + name + "'"
+  exists(string name | name = e.getName() |
+    if isPseudoKeyword(name) then result = "'" + name + "'" else result = "variable '" + name + "'"
   )
 }
 
@@ -154,10 +157,7 @@ string getDescription(VarAccess e) {
  */
 bindingset[default]
 string getDescription(Expr e, string default) {
-  if exists (getDescription(e)) then
-    result = getDescription(e)
-  else
-    result = default
+  if exists(getDescription(e)) then result = getDescription(e) else result = default
 }
 
 /**
@@ -165,10 +165,7 @@ string getDescription(Expr e, string default) {
  */
 bindingset[message1, message2, complexity1, complexity2]
 string getTypeDescription(string message1, string message2, int complexity1, int complexity2) {
-  if complexity1 > 4 and complexity2 <= 2 then
-    result = message2
-  else
-    result = message1
+  if complexity1 > 4 and complexity2 <= 2 then result = message2 else result = message1
 }
 
 /**
@@ -176,7 +173,7 @@ string getTypeDescription(string message1, string message2, int complexity1, int
  */
 predicate isInitialParameterUse(Expr e) {
   // unlike `SimpleParameter.getAnInitialUse` this will not include uses we have refinement information for
-  exists (SimpleParameter p, SsaExplicitDefinition ssa |
+  exists(SimpleParameter p, SsaExplicitDefinition ssa |
     ssa.getDef() = p and
     ssa.getVariable().getAUse() = e and
     not p.isRestParameter()
@@ -188,25 +185,25 @@ predicate isInitialParameterUse(Expr e) {
  *
  * We currently whitelist expressions that rely on inter-procedural parameter information.
  */
-predicate whitelist(Expr e) {
-  isInitialParameterUse(e)
-}
-
-from ASTNode cmp,
-     DataFlow::AnalyzedNode left, DataFlow::AnalyzedNode right,
-     string leftTypes, string rightTypes,
-     string leftExprDescription, string rightExprDescription,
-     int leftTypeCount, int rightTypeCount ,
-     string leftTypeDescription, string rightTypeDescription
-where isHeterogeneousComparison(cmp, left, right, leftTypes, rightTypes) and
-      not exists (cmp.(Expr).flow().(DefensiveExpressionTest).getTheTestResult()) and
-      not whitelist(left.asExpr()) and
-      not whitelist(right.asExpr()) and
-      leftExprDescription = capitalize(getDescription(left.asExpr(), "this expression")) and
-      rightExprDescription = getDescription(right.asExpr(), "an expression") and
-      leftTypeCount = strictcount(left.getAType()) and
-      rightTypeCount = strictcount(right.getAType()) and
-      leftTypeDescription = getTypeDescription("is of type " + leftTypes, "cannot be of type " + rightTypes, leftTypeCount, rightTypeCount) and
-      rightTypeDescription = getTypeDescription("of type " + rightTypes, ", which cannot be of type " + leftTypes, rightTypeCount, leftTypeCount)
-select left, leftExprDescription + " " + leftTypeDescription + ", but it is compared to $@ " + rightTypeDescription + ".",
-       right, rightExprDescription
+predicate whitelist(Expr e) { isInitialParameterUse(e) }
+
+from
+  ASTNode cmp, DataFlow::AnalyzedNode left, DataFlow::AnalyzedNode right, string leftTypes,
+  string rightTypes, string leftExprDescription, string rightExprDescription, int leftTypeCount,
+  int rightTypeCount, string leftTypeDescription, string rightTypeDescription
+where
+  isHeterogeneousComparison(cmp, left, right, leftTypes, rightTypes) and
+  not exists(cmp.(Expr).flow().(DefensiveExpressionTest).getTheTestResult()) and
+  not whitelist(left.asExpr()) and
+  not whitelist(right.asExpr()) and
+  leftExprDescription = capitalize(getDescription(left.asExpr(), "this expression")) and
+  rightExprDescription = getDescription(right.asExpr(), "an expression") and
+  leftTypeCount = strictcount(left.getAType()) and
+  rightTypeCount = strictcount(right.getAType()) and
+  leftTypeDescription = getTypeDescription("is of type " + leftTypes,
+      "cannot be of type " + rightTypes, leftTypeCount, rightTypeCount) and
+  rightTypeDescription = getTypeDescription("of type " + rightTypes,
+      ", which cannot be of type " + leftTypes, rightTypeCount, leftTypeCount)
+select left,
+  leftExprDescription + " " + leftTypeDescription + ", but it is compared to $@ " +
+    rightTypeDescription + ".", right, rightExprDescription
diff --git a/javascript/ql/src/Expressions/ImplicitOperandConversion.ql b/javascript/ql/src/Expressions/ImplicitOperandConversion.ql
index fce88459eaeb..e777355eade6 100644
--- a/javascript/ql/src/Expressions/ImplicitOperandConversion.ql
+++ b/javascript/ql/src/Expressions/ImplicitOperandConversion.ql
@@ -21,9 +21,7 @@ private import semmle.javascript.dataflow.InferredTypes
 abstract class ImplicitConversion extends DataFlow::AnalyzedNode {
   Expr parent;
 
-  ImplicitConversion() {
-    this.asExpr() = parent.getAChildExpr()
-  }
+  ImplicitConversion() { this.asExpr() = parent.getAChildExpr() }
 
   /**
    * Gets a description of the type(s) to which the value `v`, which is
@@ -62,17 +60,11 @@ abstract class ImplicitConversionWithWhitelist extends ImplicitConversion {
  * so they should be strings or numbers.
  */
 class PropertyNameConversion extends ImplicitConversionWithWhitelist {
-  PropertyNameConversion() {
-    this.asExpr() = parent.(InExpr).getLeftOperand()
-  }
+  PropertyNameConversion() { this.asExpr() = parent.(InExpr).getLeftOperand() }
 
-  override InferredType getAWhitelistedType() {
-    result = TTString() or result = TTNumber()
-  }
+  override InferredType getAWhitelistedType() { result = TTString() or result = TTNumber() }
 
-  override string getConversionTarget() {
-    result = "string"
-  }
+  override string getConversionTarget() { result = "string" }
 }
 
 /**
@@ -80,17 +72,13 @@ class PropertyNameConversion extends ImplicitConversionWithWhitelist {
  * so they should be Booleans, strings or numbers.
  */
 class IndexExprConversion extends ImplicitConversionWithWhitelist {
-  IndexExprConversion() {
-    this.asExpr() = parent.(IndexExpr).getIndex()
-  }
+  IndexExprConversion() { this.asExpr() = parent.(IndexExpr).getIndex() }
 
   override InferredType getAWhitelistedType() {
     result = TTBoolean() or result = TTString() or result = TTNumber()
   }
 
-  override string getConversionTarget() {
-    result = "string"
-  }
+  override string getConversionTarget() { result = "string" }
 }
 
 /**
@@ -102,30 +90,20 @@ class ObjectConversion extends ImplicitConversionWithWhitelist {
     this.asExpr() = parent.(InstanceofExpr).getLeftOperand()
   }
 
-  override InferredType getAWhitelistedType() {
-    result instanceof NonPrimitiveType
-  }
+  override InferredType getAWhitelistedType() { result instanceof NonPrimitiveType }
 
-  override string getConversionTarget() {
-    result = "object"
-  }
+  override string getConversionTarget() { result = "object" }
 }
 
 /**
  * The right-hand operand of `instanceof` should be a function or class.
  */
 class ConstructorConversion extends ImplicitConversionWithWhitelist {
-  ConstructorConversion() {
-    this.asExpr() = parent.(InstanceofExpr).getRightOperand()
-  }
+  ConstructorConversion() { this.asExpr() = parent.(InstanceofExpr).getRightOperand() }
 
-  override InferredType getAWhitelistedType() {
-    result = TTFunction() or result = TTClass()
-  }
+  override InferredType getAWhitelistedType() { result = TTFunction() or result = TTClass() }
 
-  override string getConversionTarget() {
-    result = "function"
-  }
+  override string getConversionTarget() { result = "function" }
 }
 
 /**
@@ -133,17 +111,13 @@ class ConstructorConversion extends ImplicitConversionWithWhitelist {
  * and hence should be strings, numbers or Dates.
  */
 class RelationalOperandConversion extends ImplicitConversionWithWhitelist {
-  RelationalOperandConversion() {
-    parent instanceof RelationalComparison
-  }
+  RelationalOperandConversion() { parent instanceof RelationalComparison }
 
   override InferredType getAWhitelistedType() {
     result = TTString() or result = TTNumber() or result = TTDate()
   }
 
-  override string getConversionTarget() {
-    result = "number or string"
-  }
+  override string getConversionTarget() { result = "number or string" }
 }
 
 /**
@@ -152,9 +126,12 @@ class RelationalOperandConversion extends ImplicitConversionWithWhitelist {
  */
 class NumericConversion extends ImplicitConversion {
   NumericConversion() {
-    parent instanceof BitwiseExpr or
-    parent instanceof ArithmeticExpr and not parent instanceof AddExpr or
-    parent instanceof CompoundAssignExpr and not parent instanceof AssignAddExpr or
+    parent instanceof BitwiseExpr
+    or
+    parent instanceof ArithmeticExpr and not parent instanceof AddExpr
+    or
+    parent instanceof CompoundAssignExpr and not parent instanceof AssignAddExpr
+    or
     parent instanceof UpdateExpr
   }
 
@@ -183,13 +160,9 @@ abstract class NullOrUndefinedConversion extends ImplicitConversion {
  * should not be `null` or `undefined`.
  */
 class PlusConversion extends NullOrUndefinedConversion {
-  PlusConversion() {
-    parent instanceof AddExpr or parent instanceof AssignAddExpr
-  }
+  PlusConversion() { parent instanceof AddExpr or parent instanceof AssignAddExpr }
 
-  override string getConversionTarget() {
-    result = "number or string"
-  }
+  override string getConversionTarget() { result = "number or string" }
 }
 
 /**
@@ -197,17 +170,14 @@ class PlusConversion extends NullOrUndefinedConversion {
  * be `null` or `undefined`.
  */
 class TemplateElementConversion extends NullOrUndefinedConversion {
-  TemplateElementConversion() {
-    parent instanceof TemplateLiteral
-  }
+  TemplateElementConversion() { parent instanceof TemplateLiteral }
 
-  override string getConversionTarget() {
-    result = "string"
-  }
+  override string getConversionTarget() { result = "string" }
 }
 
 from ImplicitConversion e, string convType
-where convType = e.getAnImplicitConversionTarget(_) and
-      forall (AbstractValue v | v = e.getAValue() | exists(e.getAnImplicitConversionTarget(v)))
-select e, "This expression will be implicitly converted from " +
-          e.ppTypes() + " to " + convType + "."
\ No newline at end of file
+where
+  convType = e.getAnImplicitConversionTarget(_) and
+  forall(AbstractValue v | v = e.getAValue() | exists(e.getAnImplicitConversionTarget(v)))
+select e,
+  "This expression will be implicitly converted from " + e.ppTypes() + " to " + convType + "."
diff --git a/javascript/ql/src/Expressions/MissingDotLengthInComparison.ql b/javascript/ql/src/Expressions/MissingDotLengthInComparison.ql
index b35e062e316f..705b3eedfc07 100644
--- a/javascript/ql/src/Expressions/MissingDotLengthInComparison.ql
+++ b/javascript/ql/src/Expressions/MissingDotLengthInComparison.ql
@@ -18,25 +18,28 @@ import javascript
  * Such expressions make contradictory assumptions about the types of `base` and `index`.
  */
 predicate contradictoryAccess(RelationalComparison compare, IndexExpr lookup) {
-  exists (SsaVariable base, SsaVariable index |
+  exists(SsaVariable base, SsaVariable index |
     base != index and
     compare.hasOperands(base.getAUse(), index.getAUse()) and
     lookup.getBase() = base.getAUse() and
-    lookup.getIndex() = index.getAUse())
+    lookup.getIndex() = index.getAUse()
+  )
   or
   // We allow `base` to be a global, since globals rarely undergo radical type changes
   // that depend on local control flow.
   // We could do the same for `index`, but it rarely matters for the pattern we are looking for.
   sameIndex(compare, lookup) and
-  exists (GlobalVariable base |
+  exists(GlobalVariable base |
     compare.getAnOperand() = base.getAnAccess() and
-    lookup.getBase() = base.getAnAccess())
+    lookup.getBase() = base.getAnAccess()
+  )
 }
 
 predicate sameIndex(RelationalComparison compare, IndexExpr lookup) {
-  exists (SsaVariable index |
+  exists(SsaVariable index |
     compare.getAnOperand() = index.getAUse() and
-    lookup.getIndex() = index.getAUse())
+    lookup.getIndex() = index.getAUse()
+  )
 }
 
 predicate relevantBasicBlocks(ReachableBasicBlock b1, ReachableBasicBlock b2) {
@@ -49,6 +52,7 @@ predicate sameBranch(ReachableBasicBlock b1, ReachableBasicBlock b2) {
 }
 
 from RelationalComparison compare, IndexExpr lookup
-where contradictoryAccess(compare, lookup)
-  and sameBranch(compare.getBasicBlock(), lookup.getBasicBlock())
+where
+  contradictoryAccess(compare, lookup) and
+  sameBranch(compare.getBasicBlock(), lookup.getBasicBlock())
 select compare, "Missing .length in comparison, or erroneous $@.", lookup, "index expression"
diff --git a/javascript/ql/src/Expressions/MissingSpaceInAppend.ql b/javascript/ql/src/Expressions/MissingSpaceInAppend.ql
index c74411b5a749..4870927fd519 100644
--- a/javascript/ql/src/Expressions/MissingSpaceInAppend.ql
+++ b/javascript/ql/src/Expressions/MissingSpaceInAppend.ql
@@ -30,16 +30,16 @@ class LiteralOrTemplate extends Expr {
 }
 
 from AddExpr e, LiteralOrTemplate l, LiteralOrTemplate r, string word
-where // l and r are appended together
-      l = rightChild*(e.getLeftOperand()) and
-      r = leftChild*(e.getRightOperand()) and
-
-      // `l + r` is of the form `... word" + "word2...`, possibly including some
-      // punctuation after `word`.
-      // Only the first character of `word2` is matched, whereas `word` is matched
-      // completely to distinguish grammatical punctuation after which a space is
-      // needed, and intra-identifier punctuation in, for example, a qualified name.
-      word = l.getStringValue().regexpCapture(".* (([-A-Za-z/'\\.:,]*[a-zA-Z]|[0-9]+)[\\.:,!?']*)", 1) and
-      r.getStringValue().regexpMatch("[a-zA-Z].*") and
-      not word.regexpMatch(".*[,\\.:].*[a-zA-Z].*[^a-zA-Z]")
+where
+  // l and r are appended together
+  l = rightChild*(e.getLeftOperand()) and
+  r = leftChild*(e.getRightOperand()) and
+  // `l + r` is of the form `... word" + "word2...`, possibly including some
+  // punctuation after `word`.
+  // Only the first character of `word2` is matched, whereas `word` is matched
+  // completely to distinguish grammatical punctuation after which a space is
+  // needed, and intra-identifier punctuation in, for example, a qualified name.
+  word = l.getStringValue().regexpCapture(".* (([-A-Za-z/'\\.:,]*[a-zA-Z]|[0-9]+)[\\.:,!?']*)", 1) and
+  r.getStringValue().regexpMatch("[a-zA-Z].*") and
+  not word.regexpMatch(".*[,\\.:].*[a-zA-Z].*[^a-zA-Z]")
 select l, "This string appears to be missing a space after '" + word + "'."
diff --git a/javascript/ql/src/Expressions/MisspelledIdentifier.ql b/javascript/ql/src/Expressions/MisspelledIdentifier.ql
index 0e2cef3a2236..4d482724a500 100644
--- a/javascript/ql/src/Expressions/MisspelledIdentifier.ql
+++ b/javascript/ql/src/Expressions/MisspelledIdentifier.ql
@@ -15,9 +15,7 @@ import Misspelling
  * An identifier part.
  */
 class IdentifierPart extends string {
-  IdentifierPart() {
-    idPart(_, this, _)
-  }
+  IdentifierPart() { idPart(_, this, _) }
 
   /**
    * Holds if this element is at the specified location.
@@ -26,13 +24,18 @@ class IdentifierPart extends string {
    * For more information, see
    * [LGTM locations](https://lgtm.com/help/ql/locations).
    */
-  predicate hasLocationInfo(string filepath, int startline, int startcolumn,
-                                             int endline, int endcolumn) {
-    exists (Identifier id, int start, Location l, int len | occursIn(id, start, len) and l = id.getLocation() |
+  predicate hasLocationInfo(
+    string filepath, int startline, int startcolumn, int endline, int endcolumn
+  ) {
+    exists(Identifier id, int start, Location l, int len |
+      occursIn(id, start, len) and l = id.getLocation()
+    |
       filepath = l.getFile().getAbsolutePath() and
-      startline = l.getStartLine() and startcolumn = l.getStartColumn() + start and
+      startline = l.getStartLine() and
+      startcolumn = l.getStartColumn() + start and
       // identifiers cannot span more than one line
-      endline = startline and endcolumn = startcolumn + len - 1
+      endline = startline and
+      endcolumn = startcolumn + len - 1
     )
   }
 
@@ -49,15 +52,13 @@ class IdentifierPart extends string {
  * An identifier part that corresponds to a typo in `normalized_typos`.
  */
 class WrongIdentifierPart extends IdentifierPart {
-  WrongIdentifierPart() {
-    normalized_typos(this, _, _, _, _, _)
-  }
+  WrongIdentifierPart() { normalized_typos(this, _, _, _, _, _) }
 
   /**
    * Gets an identifier part that corresponds to a correction of this typo.
    */
   string getASuggestion() {
-    exists (IdentifierPart right | normalized_typos(this, right, _, _, _, _) |
+    exists(IdentifierPart right | normalized_typos(this, right, _, _, _, _) |
       result = "'" + right + "'"
     )
   }
@@ -67,7 +68,7 @@ class WrongIdentifierPart extends IdentifierPart {
    * this typo that appear as identifier parts in the code.
    */
   string ppSuggestions() {
-    exists (string cat |
+    exists(string cat |
       // first, concatenate with commas
       cat = concat(getASuggestion(), ", ") and
       // then, replace last comma with "or"
@@ -79,10 +80,12 @@ class WrongIdentifierPart extends IdentifierPart {
     super.occursIn(id, start, len) and
     // throw out cases where the wrong word appears as a prefix or suffix of a right word,
     // and thus the result is most likely a false positive caused by our word segmentation algorithm
-    exists (string lowerid | lowerid = id.getName().toLowerCase() |
-      not exists (string right, int rightlen |
-        this.prefixOf(right, rightlen) and lowerid.substring(start, start+rightlen) = right or
-        this.suffixOf(right, rightlen) and lowerid.substring(start+len-rightlen, start+len) = right
+    exists(string lowerid | lowerid = id.getName().toLowerCase() |
+      not exists(string right, int rightlen |
+        this.prefixOf(right, rightlen) and lowerid.substring(start, start + rightlen) = right
+        or
+        this.suffixOf(right, rightlen) and
+        lowerid.substring(start + len - rightlen, start + len) = right
       )
     ) and
     // also throw out cases flagged by another query
@@ -94,10 +97,13 @@ class WrongIdentifierPart extends IdentifierPart {
    * a correct spelling with length `rightlen`.
    */
   predicate prefixOf(string right, int rightlen) {
-    exists (string c, int wronglen |
-      normalized_typos(this, _, c, _, _, _) and normalized_typos(_, right, _, _, c, _) and
-      wronglen = this.length() and rightlen = right.length() and
-      wronglen < rightlen and right.prefix(wronglen) = this
+    exists(string c, int wronglen |
+      normalized_typos(this, _, c, _, _, _) and
+      normalized_typos(_, right, _, _, c, _) and
+      wronglen = this.length() and
+      rightlen = right.length() and
+      wronglen < rightlen and
+      right.prefix(wronglen) = this
     )
   }
 
@@ -106,17 +112,21 @@ class WrongIdentifierPart extends IdentifierPart {
    * a correct spelling with length `rightlen`.
    */
   predicate suffixOf(string right, int rightlen) {
-    exists (string c, int wronglen |
-      normalized_typos(this, _, _, c, _, _) and normalized_typos(_, right, _, _, _, c) and
-      wronglen = this.length() and rightlen = right.length() and
-      wronglen < rightlen and right.suffix(rightlen-wronglen) = this
+    exists(string c, int wronglen |
+      normalized_typos(this, _, _, c, _, _) and
+      normalized_typos(_, right, _, _, _, c) and
+      wronglen = this.length() and
+      rightlen = right.length() and
+      wronglen < rightlen and
+      right.suffix(rightlen - wronglen) = this
     )
   }
 }
 
 from WrongIdentifierPart wrong
-where // make sure we have at least one occurrence of a correction
-      exists(wrong.getASuggestion()) and
-      // make sure we have at least one unambiguous occurrence of the wrong word
-      wrong.occursIn(_, _, _)
+where
+  // make sure we have at least one occurrence of a correction
+  exists(wrong.getASuggestion()) and
+  // make sure we have at least one unambiguous occurrence of the wrong word
+  wrong.occursIn(_, _, _)
 select wrong, "'" + wrong + "' may be a typo for " + wrong.ppSuggestions() + "."
diff --git a/javascript/ql/src/Expressions/Misspelling.qll b/javascript/ql/src/Expressions/Misspelling.qll
index 1d471a8bcfcc..d143c0394beb 100644
--- a/javascript/ql/src/Expressions/Misspelling.qll
+++ b/javascript/ql/src/Expressions/Misspelling.qll
@@ -3,7 +3,6 @@
  */
 
 import javascript
-
 // import typo database (generated from Wikipedia, licensed under CC BY-SA 3.0)
 import TypoDatabase
 
@@ -12,9 +11,12 @@ import TypoDatabase
  * is not interesting enough to flag.
  */
 predicate whitelisted(string wrong, string right) {
-  wrong = "thru" and right = "through" or
-  wrong = "cant" and right = "cannot" or
-  wrong = "inbetween" and right = "between" or
+  wrong = "thru" and right = "through"
+  or
+  wrong = "cant" and right = "cannot"
+  or
+  wrong = "inbetween" and right = "between"
+  or
   wrong = "strat" and right = "start" // often used as abbreviation for "strategy"
 }
 
@@ -24,15 +26,18 @@ predicate whitelisted(string wrong, string right) {
  * of `wrong`, and similarly for `rightstart` and `rightend`.
  */
 cached
-predicate normalized_typos(string wrong, string right,
-    string wrongstart, string wrongend, string rightstart, string rightend) {
+predicate normalized_typos(
+  string wrong, string right, string wrongstart, string wrongend, string rightstart, string rightend
+) {
   typos(wrong, right) and
   not whitelisted(wrong, right) and
   // omit very short identifiers, which are often idiosyncratic abbreviations
   wrong.length() > 3 and
   // record first and last characters
-  wrongstart = wrong.charAt(0) and wrongend = wrong.charAt(wrong.length()-1) and
-  rightstart = right.charAt(0) and rightend = right.charAt(right.length()-1)
+  wrongstart = wrong.charAt(0) and
+  wrongend = wrong.charAt(wrong.length() - 1) and
+  rightstart = right.charAt(0) and
+  rightend = right.charAt(right.length() - 1)
 }
 
 /**
@@ -63,7 +68,7 @@ predicate idPart(Identifier id, string part, int offset) {
 /** An identifier that contains at least one misspelling. */
 private class WrongIdentifier extends Identifier {
   WrongIdentifier() {
-    exists (string wrongPart |
+    exists(string wrongPart |
       idPart(this, wrongPart, _) and
       normalized_typos(wrongPart, _, _, _, _, _)
     )
@@ -73,7 +78,7 @@ private class WrongIdentifier extends Identifier {
 /** A variable whose name contains at least one misspelling. */
 private class WrongVariable extends LocalVariable {
   WrongVariable() {
-    exists (string wrongPart |
+    exists(string wrongPart |
       idPart(this.getADeclaration(), wrongPart, _) and
       normalized_typos(wrongPart, _, _, _, _, _)
     )
@@ -82,12 +87,12 @@ private class WrongVariable extends LocalVariable {
 
 /** Gets the name of identifier `wrong`, with one misspelling corrected. */
 private string replaceATypoAndLowerCase(Identifier wrong) {
-  exists (string wrongPart, string rightName, string rightPart, int offset |
-    idPart(wrong, wrongPart, offset) |
+  exists(string wrongPart, string rightName, string rightPart, int offset |
+    idPart(wrong, wrongPart, offset)
+  |
     normalized_typos(wrongPart, rightPart, _, _, _, _) and
-    rightName = wrong.getName().substring(0, offset)
-              + rightPart
-              + wrong.getName().suffix(offset + wrongPart.length()) and
+    rightName = wrong.getName().substring(0, offset) + rightPart +
+        wrong.getName().suffix(offset + wrongPart.length()) and
     result = rightName.toLowerCase()
   )
 }
@@ -108,7 +113,7 @@ private Identifier idInScopeOfWrongVariable(WrongVariable wrong) {
  * of `lvd` or vice versa.
  */
 predicate misspelledVariableName(GlobalVarAccess gva, VarDecl lvd) {
-  exists (LocalVariable lv | lvd = lv.getADeclaration() |
+  exists(LocalVariable lv | lvd = lv.getADeclaration() |
     lv.getScope() = scopeAroundWrongIdentifier(gva) and
     lv.getName().toLowerCase() = replaceATypoAndLowerCase(gva)
     or
diff --git a/javascript/ql/src/Expressions/RedundantExpression.ql b/javascript/ql/src/Expressions/RedundantExpression.ql
index ffc7c484e24e..b35c0980706e 100644
--- a/javascript/ql/src/Expressions/RedundantExpression.ql
+++ b/javascript/ql/src/Expressions/RedundantExpression.ql
@@ -19,18 +19,12 @@ import Clones
  * A clone detector that finds redundant expressions.
  */
 abstract class RedundantOperand extends StructurallyCompared {
-  RedundantOperand() {
-    exists (BinaryExpr parent | this = parent.getLeftOperand())
-  }
+  RedundantOperand() { exists(BinaryExpr parent | this = parent.getLeftOperand()) }
 
-  override Expr candidate() {
-    result = getParent().(BinaryExpr).getRightOperand()
-  }
+  override Expr candidate() { result = getParent().(BinaryExpr).getRightOperand() }
 
   /** Gets the expression to report when a pair of clones is found. */
-  Expr toReport() {
-    result = getParent()
-  }
+  Expr toReport() { result = getParent() }
 }
 
 /**
@@ -55,7 +49,7 @@ class IdemnecantExpr extends BinaryExpr {
  */
 class RedundantIdemnecantOperand extends RedundantOperand {
   RedundantIdemnecantOperand() {
-    exists (IdemnecantExpr parent |
+    exists(IdemnecantExpr parent |
       parent = getParent() and
       // exclude trivial cases like `1-1`
       not parent.getRightOperand().getUnderlyingValue() instanceof Literal
@@ -70,9 +64,7 @@ class RedundantIdemnecantOperand extends RedundantOperand {
  * arguments to integers. For example, `x&x` is a common idiom for converting `x` to an integer.
  */
 class RedundantIdempotentOperand extends RedundantOperand {
-  RedundantIdempotentOperand() {
-    getParent() instanceof LogicalBinaryExpr
-  }
+  RedundantIdempotentOperand() { getParent() instanceof LogicalBinaryExpr }
 }
 
 /**
@@ -90,16 +82,12 @@ class AverageExpr extends DivExpr {
  */
 class RedundantAverageOperand extends RedundantOperand {
   RedundantAverageOperand() {
-    exists (AverageExpr aver |
-      (AddExpr)getParent() = aver.getLeftOperand().getUnderlyingValue()
-    )
+    exists(AverageExpr aver | getParent().(AddExpr) = aver.getLeftOperand().getUnderlyingValue())
   }
 
-  override AverageExpr toReport() {
-    getParent() = result.getLeftOperand().getUnderlyingValue()
-  }
+  override AverageExpr toReport() { getParent() = result.getLeftOperand().getUnderlyingValue() }
 }
 
 from RedundantOperand e, Expr f
 where e.same(f)
-select e.toReport(), "Operands $@ and $@ are identical.", e, e.toString(), f, f.toString()
\ No newline at end of file
+select e.toReport(), "Operands $@ and $@ are identical.", e, e.toString(), f, f.toString()
diff --git a/javascript/ql/src/Expressions/SelfAssignment.ql b/javascript/ql/src/Expressions/SelfAssignment.ql
index d07f568a6a60..50d55a50bfe4 100644
--- a/javascript/ql/src/Expressions/SelfAssignment.ql
+++ b/javascript/ql/src/Expressions/SelfAssignment.ql
@@ -24,26 +24,24 @@ import DOMProperties
  * in which case `element <name>` is used instead.
  */
 string describe(Expr e) {
-  exists (VarAccess va | va = e | result = "variable " + va.getName())
+  exists(VarAccess va | va = e | result = "variable " + va.getName())
   or
-  exists (string name | name = e.(PropAccess).getPropertyName() |
-    if exists(name.toInt()) then
-      result = "element " + name
-    else
-      result = "property " + name
+  exists(string name | name = e.(PropAccess).getPropertyName() |
+    if exists(name.toInt()) then result = "element " + name else result = "property " + name
   )
 }
 
 from SelfAssignment e, string dsc
-where e.same(_) and
-      dsc = describe(e) and
-      // exclude properties for which there is an accessor somewhere
-      not exists(string propName | propName = e.(PropAccess).getPropertyName() |
-        propName = any(PropertyAccessor acc).getName() or
-        propName = any(AccessorMethodDeclaration amd).getName()
-      ) and
-      // exclude DOM properties
-      not isDOMProperty(e.(PropAccess).getPropertyName()) and
-      // exclude self-assignments that have been inserted to satisfy the TypeScript JS-checker
-      not e.getAssignment().getParent().(ExprStmt).getDocumentation().getATag().getTitle() = "type"
+where
+  e.same(_) and
+  dsc = describe(e) and
+  // exclude properties for which there is an accessor somewhere
+  not exists(string propName | propName = e.(PropAccess).getPropertyName() |
+    propName = any(PropertyAccessor acc).getName() or
+    propName = any(AccessorMethodDeclaration amd).getName()
+  ) and
+  // exclude DOM properties
+  not isDOMProperty(e.(PropAccess).getPropertyName()) and
+  // exclude self-assignments that have been inserted to satisfy the TypeScript JS-checker
+  not e.getAssignment().getParent().(ExprStmt).getDocumentation().getATag().getTitle() = "type"
 select e.getParent(), "This expression assigns " + dsc + " to itself."
diff --git a/javascript/ql/src/Expressions/ShiftOutOfRange.ql b/javascript/ql/src/Expressions/ShiftOutOfRange.ql
index bc5e0e9a6f6b..1354c58501c3 100644
--- a/javascript/ql/src/Expressions/ShiftOutOfRange.ql
+++ b/javascript/ql/src/Expressions/ShiftOutOfRange.ql
@@ -15,4 +15,4 @@ import javascript
 
 from ShiftExpr shift
 where shift.getRightOperand().getIntValue() > 31
-select shift, "Shift out of range."
\ No newline at end of file
+select shift, "Shift out of range."
diff --git a/javascript/ql/src/Expressions/StringInsteadOfRegex.ql b/javascript/ql/src/Expressions/StringInsteadOfRegex.ql
index 228a6ff6290e..7a7843638324 100644
--- a/javascript/ql/src/Expressions/StringInsteadOfRegex.ql
+++ b/javascript/ql/src/Expressions/StringInsteadOfRegex.ql
@@ -7,6 +7,7 @@
  * @tags correctness
  * @precision high
  */
+
 import javascript
 
 /**
@@ -26,11 +27,16 @@ private string getALikelyRegExpPattern() {
  * Holds if `mce` is a call to String.prototype.replace or String.prototype.split
  */
 predicate isStringSplitOrReplace(MethodCallExpr mce) {
-  exists (string name, int arity |
+  exists(string name, int arity |
     mce.getMethodName() = name and
-    mce.getNumArgument() = arity |
-    (name = "replace" and arity = 2) or
-    (name = "split" and (arity = 1 or arity = 2))
+    mce.getNumArgument() = arity
+  |
+    (name = "replace" and arity = 2)
+    or
+    (
+      name = "split" and
+      (arity = 1 or arity = 2)
+    )
   )
 }
 
@@ -42,9 +48,12 @@ predicate mayReferToString(DataFlow::Node nd, StringLiteral s) {
 }
 
 from MethodCallExpr mce, StringLiteral arg, string raw, string s
-where isStringSplitOrReplace(mce) and
-      mayReferToString(mce.getArgument(0).flow(), arg) and
-      raw = arg.getRawValue() and
-      s = raw.substring(1, raw.length() - 1) and
-      s.regexpMatch(getALikelyRegExpPattern())
-select mce, "String argument '$@' looks like a regular expression, but it will be interpreted as a string.", arg, s
+where
+  isStringSplitOrReplace(mce) and
+  mayReferToString(mce.getArgument(0).flow(), arg) and
+  raw = arg.getRawValue() and
+  s = raw.substring(1, raw.length() - 1) and
+  s.regexpMatch(getALikelyRegExpPattern())
+select mce,
+  "String argument '$@' looks like a regular expression, but it will be interpreted as a string.",
+  arg, s
diff --git a/javascript/ql/src/Expressions/SuspiciousInvocation.ql b/javascript/ql/src/Expressions/SuspiciousInvocation.ql
index 902fbd5abdae..ca7281eba5cd 100644
--- a/javascript/ql/src/Expressions/SuspiciousInvocation.ql
+++ b/javascript/ql/src/Expressions/SuspiciousInvocation.ql
@@ -14,8 +14,9 @@ import javascript
 private import semmle.javascript.dataflow.InferredTypes
 
 from InvokeExpr invk, DataFlow::AnalyzedNode callee
-where callee.asExpr() = invk.getCallee() and
-      forex (InferredType tp | tp = callee.getAType() | tp != TTFunction() and tp != TTClass()) and
-      not invk.isAmbient() and
-      not invk instanceof OptionalUse
-select invk, "Callee is not a function: it has type " + callee.ppTypes() + "."
\ No newline at end of file
+where
+  callee.asExpr() = invk.getCallee() and
+  forex(InferredType tp | tp = callee.getAType() | tp != TTFunction() and tp != TTClass()) and
+  not invk.isAmbient() and
+  not invk instanceof OptionalUse
+select invk, "Callee is not a function: it has type " + callee.ppTypes() + "."
diff --git a/javascript/ql/src/Expressions/SuspiciousPropAccess.ql b/javascript/ql/src/Expressions/SuspiciousPropAccess.ql
index 946c6d78418c..0522de6958e4 100644
--- a/javascript/ql/src/Expressions/SuspiciousPropAccess.ql
+++ b/javascript/ql/src/Expressions/SuspiciousPropAccess.ql
@@ -23,15 +23,18 @@ private import semmle.javascript.dataflow.InferredTypes
  * if it is part of a const enum access, so we conservatively silence the alert in that case.
  */
 predicate namespaceOrConstEnumAccess(VarAccess e) {
-  exists (NamespaceDeclaration decl | e.getVariable().getADeclaration() = decl.getId())
+  exists(NamespaceDeclaration decl | e.getVariable().getADeclaration() = decl.getId())
   or
-  exists (EnumDeclaration decl | e.getVariable().getADeclaration() = decl.getIdentifier() | decl.isConst())
+  exists(EnumDeclaration decl | e.getVariable().getADeclaration() = decl.getIdentifier() |
+    decl.isConst()
+  )
 }
 
 from PropAccess pacc, DataFlow::AnalyzedNode base
-where base.asExpr() = pacc.getBase() and
-      forex (InferredType tp | tp = base.getAType() | tp = TTNull() or tp = TTUndefined()) and
-      not namespaceOrConstEnumAccess(pacc.getBase()) and
-      not pacc.isAmbient() and
-      not pacc instanceof OptionalUse
+where
+  base.asExpr() = pacc.getBase() and
+  forex(InferredType tp | tp = base.getAType() | tp = TTNull() or tp = TTUndefined()) and
+  not namespaceOrConstEnumAccess(pacc.getBase()) and
+  not pacc.isAmbient() and
+  not pacc instanceof OptionalUse
 select pacc, "The base expression of this property access is always " + base.ppTypes() + "."
diff --git a/javascript/ql/src/Expressions/UnboundEventHandlerReceiver.ql b/javascript/ql/src/Expressions/UnboundEventHandlerReceiver.ql
index a0940d777279..9095c735a702 100644
--- a/javascript/ql/src/Expressions/UnboundEventHandlerReceiver.ql
+++ b/javascript/ql/src/Expressions/UnboundEventHandlerReceiver.ql
@@ -7,35 +7,37 @@
  * @tags correctness
  * @precision high
  */
+
 import javascript
 
 /**
  * Holds if the receiver of `method` is bound.
  */
 private predicate isBoundInMethod(MethodDeclaration method) {
-  exists (DataFlow::ThisNode thiz, MethodDeclaration bindingMethod |
+  exists(DataFlow::ThisNode thiz, MethodDeclaration bindingMethod |
     bindingMethod.getDeclaringClass() = method.getDeclaringClass() and
     not bindingMethod.isStatic() and
-    thiz.getBinder().getAstNode() = bindingMethod.getBody() |
+    thiz.getBinder().getAstNode() = bindingMethod.getBody()
+  |
     // require("auto-bind")(this)
     thiz.flowsTo(DataFlow::moduleImport("auto-bind").getACall().getArgument(0))
     or
-    exists (string name |
-      name = method.getName() |
-      exists (DataFlow::MethodCallNode bind |
+    exists(string name | name = method.getName() |
+      exists(DataFlow::MethodCallNode bind |
         // this.<methodName> = <expr>.bind(...)
         bind = thiz.getAPropertySource(name) and
         bind.getMethodName() = "bind"
       )
       or
-      exists (DataFlow::MethodCallNode bindAll |
+      exists(DataFlow::MethodCallNode bindAll |
         bindAll.getMethodName() = "bindAll" and
-        thiz.flowsTo(bindAll.getArgument(0)) |
+        thiz.flowsTo(bindAll.getArgument(0))
+      |
         // _.bindAll(this, <name1>)
         bindAll.getArgument(1).mayHaveStringValue(name)
         or
         // _.bindAll(this, [<name1>, <name2>])
-        exists (DataFlow::ArrayCreationNode names |
+        exists(DataFlow::ArrayCreationNode names |
           names.flowsTo(bindAll.getArgument(1)) and
           names.getAnElement().mayHaveStringValue(name)
         )
@@ -43,15 +45,17 @@ private predicate isBoundInMethod(MethodDeclaration method) {
     )
   )
   or
-  exists (Expr decoration, string name |
+  exists(Expr decoration, string name |
     (
       decoration = method.getADecorator().getExpression()
       or
       decoration = method.getDeclaringType().(ClassDefinition).getADecorator().getExpression()
     ) and
-    name.regexpMatch("(?i).*(bind|bound).*") |
+    name.regexpMatch("(?i).*(bind|bound).*")
+  |
     // @autobind
-    decoration.(Identifier).getName() = name or
+    decoration.(Identifier).getName() = name
+    or
     // @action.bound
     decoration.(PropAccess).getPropertyName() = name
   )
@@ -61,7 +65,7 @@ private predicate isBoundInMethod(MethodDeclaration method) {
  * Gets an event handler attribute (onClick, onTouch, ...).
  */
 private DOM::AttributeDefinition getAnEventHandlerAttribute() {
-  exists (ReactComponent c, JSXNode rendered, string attributeName |
+  exists(ReactComponent c, JSXNode rendered, string attributeName |
     c.getRenderMethod().getAReturnedExpr().flow().getALocalSource().asExpr() = rendered and
     result = rendered.getABodyElement*().(JSXElement).getAttributeByName(attributeName) and
     attributeName.regexpMatch("on[A-Z][a-zA-Z]+") // camelCased with 'on'-prefix
@@ -70,8 +74,11 @@ private DOM::AttributeDefinition getAnEventHandlerAttribute() {
 
 from MethodDeclaration callback, DOM::AttributeDefinition attribute, ThisExpr unbound
 where
-      attribute = getAnEventHandlerAttribute() and
-      attribute.getValueNode().analyze().getAValue().(AbstractFunction).getFunction() = callback.getBody() and
-      unbound.getBinder() = callback.getBody() and
-      not isBoundInMethod(callback)
-select attribute, "The receiver of this event handler call is unbound, `$@` will be `undefined` in the call to $@", unbound, "this", callback, callback.getName()
+  attribute = getAnEventHandlerAttribute() and
+  attribute.getValueNode().analyze().getAValue().(AbstractFunction).getFunction() = callback
+        .getBody() and
+  unbound.getBinder() = callback.getBody() and
+  not isBoundInMethod(callback)
+select attribute,
+  "The receiver of this event handler call is unbound, `$@` will be `undefined` in the call to $@",
+  unbound, "this", callback, callback.getName()
diff --git a/javascript/ql/src/Expressions/UnclearOperatorPrecedence.ql b/javascript/ql/src/Expressions/UnclearOperatorPrecedence.ql
index 7438835d794e..869971f5f1fb 100644
--- a/javascript/ql/src/Expressions/UnclearOperatorPrecedence.ql
+++ b/javascript/ql/src/Expressions/UnclearOperatorPrecedence.ql
@@ -16,14 +16,16 @@
 import javascript
 
 from BitwiseBinaryExpr bit, Comparison rel, Expr other
-where bit.hasOperands(rel, other) and
-      // only flag if whitespace doesn't clarify the nesting (note that if `bit` has less
-      // whitespace than `rel`, it will be reported by `js/whitespace-contradicts-precedence`)
-      bit.getWhitespaceAroundOperator() = rel.getWhitespaceAroundOperator() and
-      // don't flag if the other operand is itself a comparison,
-      // since the nesting tends to be visually more obvious in such cases
-      not other instanceof Comparison and
-      // don't flag occurrences in minified code
-      not rel.getTopLevel().isMinified()
-select rel, "The '" + rel.getOperator() + "' operator binds more tightly than " +
-            "'" + bit.getOperator() + "', which may not be obvious in this case."
\ No newline at end of file
+where
+  bit.hasOperands(rel, other) and
+  // only flag if whitespace doesn't clarify the nesting (note that if `bit` has less
+  // whitespace than `rel`, it will be reported by `js/whitespace-contradicts-precedence`)
+  bit.getWhitespaceAroundOperator() = rel.getWhitespaceAroundOperator() and
+  // don't flag if the other operand is itself a comparison,
+  // since the nesting tends to be visually more obvious in such cases
+  not other instanceof Comparison and
+  // don't flag occurrences in minified code
+  not rel.getTopLevel().isMinified()
+select rel,
+  "The '" + rel.getOperator() + "' operator binds more tightly than " + "'" + bit.getOperator() +
+    "', which may not be obvious in this case."
diff --git a/javascript/ql/src/Expressions/UnknownDirective.ql b/javascript/ql/src/Expressions/UnknownDirective.ql
index 6102a69bf2e2..500711436ae8 100644
--- a/javascript/ql/src/Expressions/UnknownDirective.ql
+++ b/javascript/ql/src/Expressions/UnknownDirective.ql
@@ -11,7 +11,8 @@
 import javascript
 
 from Directive d
-where not d instanceof KnownDirective and
-      // but exclude attribute top-levels: `<a href="javascript:'some-attribute-string'">`
-      not (d.getParent() instanceof CodeInAttribute)
-select d, "Unknown directive: '" + truncate(d.getDirectiveText(), 20, " ... (truncated)")  + "'."
+where
+  not d instanceof KnownDirective and
+  // but exclude attribute top-levels: `<a href="javascript:'some-attribute-string'">`
+  not (d.getParent() instanceof CodeInAttribute)
+select d, "Unknown directive: '" + truncate(d.getDirectiveText(), 20, " ... (truncated)") + "'."
diff --git a/javascript/ql/src/Expressions/UnneededDefensiveProgramming.ql b/javascript/ql/src/Expressions/UnneededDefensiveProgramming.ql
index bb36d94aef33..099d033b9928 100644
--- a/javascript/ql/src/Expressions/UnneededDefensiveProgramming.ql
+++ b/javascript/ql/src/Expressions/UnneededDefensiveProgramming.ql
@@ -14,18 +14,18 @@ import javascript
 import semmle.javascript.DefensiveProgramming
 
 from DefensiveExpressionTest e, boolean cv
-where e.getTheTestResult() = cv and
-      // whitelist
-      not (
-        // module environment detection
-        exists (VarAccess access, string name |
-          name = "exports" or name = "module" |
-          e.asExpr().(Internal::TypeofUndefinedTest).getOperand() = access and
-          access.getName() = name and
-          not exists (access.getVariable().getADeclaration())
-        )
-        or
-        // too benign in practice
-        e instanceof Internal::DefensiveInit
-      )
+where
+  e.getTheTestResult() = cv and
+  // whitelist
+  not (
+    // module environment detection
+    exists(VarAccess access, string name | name = "exports" or name = "module" |
+      e.asExpr().(Internal::TypeofUndefinedTest).getOperand() = access and
+      access.getName() = name and
+      not exists(access.getVariable().getADeclaration())
+    )
+    or
+    // too benign in practice
+    e instanceof Internal::DefensiveInit
+  )
 select e, "This guard always evaluates to " + cv + "."
diff --git a/javascript/ql/src/Expressions/WhitespaceContradictsPrecedence.ql b/javascript/ql/src/Expressions/WhitespaceContradictsPrecedence.ql
index 9f3ad1d3117a..58e16189f3f7 100644
--- a/javascript/ql/src/Expressions/WhitespaceContradictsPrecedence.ql
+++ b/javascript/ql/src/Expressions/WhitespaceContradictsPrecedence.ql
@@ -26,9 +26,15 @@ class AssocNestedExpr extends BinaryExpr {
   AssocNestedExpr() {
     exists(BinaryExpr parent, int idx | this = parent.getChildExpr(idx) |
       // +, *, &&, || and the bitwise operations are associative
-      ((this instanceof AddExpr or this instanceof MulExpr or
-        this instanceof BitwiseExpr or this instanceof LogicalBinaryExpr) and
-        parent.getOperator() = this.getOperator())
+      (
+        (
+          this instanceof AddExpr or
+          this instanceof MulExpr or
+          this instanceof BitwiseExpr or
+          this instanceof LogicalBinaryExpr
+        ) and
+        parent.getOperator() = this.getOperator()
+      )
       or
       // (x*y)/z = x*(y/z)
       (this instanceof MulExpr and parent instanceof DivExpr and idx = 0)
@@ -37,7 +43,8 @@ class AssocNestedExpr extends BinaryExpr {
       (this instanceof DivExpr and parent instanceof ModExpr and idx = 0)
       or
       // (x+y)-z = x+(y-z)
-      (this instanceof AddExpr and parent instanceof SubExpr and idx = 0))
+      (this instanceof AddExpr and parent instanceof SubExpr and idx = 0)
+    )
   }
 }
 
@@ -48,9 +55,13 @@ class AssocNestedExpr extends BinaryExpr {
 class HarmlessNestedExpr extends BinaryExpr {
   HarmlessNestedExpr() {
     exists(BinaryExpr parent | this = parent.getAChildExpr() |
-      (parent instanceof Comparison and (this instanceof ArithmeticExpr or this instanceof ShiftExpr))
+      (
+        parent instanceof Comparison and
+        (this instanceof ArithmeticExpr or this instanceof ShiftExpr)
+      )
       or
-      (parent instanceof LogicalExpr and this instanceof Comparison))
+      (parent instanceof LogicalExpr and this instanceof Comparison)
+    )
   }
 }
 
@@ -66,7 +77,8 @@ predicate interestingNesting(BinaryExpr inner, BinaryExpr outer) {
 }
 
 from BinaryExpr inner, BinaryExpr outer
-where interestingNesting(inner, outer) and
-      inner.getWhitespaceAroundOperator() > outer.getWhitespaceAroundOperator() and
-      not outer.getTopLevel().isMinified()
-select outer, "Whitespace around nested operators contradicts precedence."
\ No newline at end of file
+where
+  interestingNesting(inner, outer) and
+  inner.getWhitespaceAroundOperator() > outer.getWhitespaceAroundOperator() and
+  not outer.getTopLevel().isMinified()
+select outer, "Whitespace around nested operators contradicts precedence."
diff --git a/javascript/ql/src/JSDoc/BadParamTag.ql b/javascript/ql/src/JSDoc/BadParamTag.ql
index 284368d7bd23..b4a9012a0ddb 100644
--- a/javascript/ql/src/JSDoc/BadParamTag.ql
+++ b/javascript/ql/src/JSDoc/BadParamTag.ql
@@ -15,8 +15,13 @@
 import javascript
 
 from JSDocParamTag parm, string missing
-where // JSDoc comments in externs files are not necessarily meant for human readers, so don't complain
-      not parm.getFile().getATopLevel().isExterns() and
-      (not exists(parm.getName()) and missing = "name" or
-       (not exists(parm.getDescription()) or parm.getDescription().regexpMatch("\\s*")) and missing = "description")
-select parm, "@param tag is missing " + missing + "."
\ No newline at end of file
+where
+  // JSDoc comments in externs files are not necessarily meant for human readers, so don't complain
+  not parm.getFile().getATopLevel().isExterns() and
+  (
+    not exists(parm.getName()) and missing = "name"
+    or
+    (not exists(parm.getDescription()) or parm.getDescription().regexpMatch("\\s*")) and
+    missing = "description"
+  )
+select parm, "@param tag is missing " + missing + "."
diff --git a/javascript/ql/src/JSDoc/JSDocForNonExistentParameter.ql b/javascript/ql/src/JSDoc/JSDocForNonExistentParameter.ql
index 721a15749bfd..07fa594a28b9 100644
--- a/javascript/ql/src/JSDoc/JSDocForNonExistentParameter.ql
+++ b/javascript/ql/src/JSDoc/JSDocForNonExistentParameter.ql
@@ -14,13 +14,14 @@
 import javascript
 
 from Function f, JSDoc doc, JSDocParamTag tag, string parmName
-where doc = f.getDocumentation() and
-      tag = doc.getATag() and
-      parmName = tag.getName() and
-      tag.documentsSimpleName() and
-      not exists (f.getParameterByName(parmName)) and
-      // don't report functions without declared parameters that use `arguments`
-      not (f.getNumParameter() = 0 and f.usesArgumentsObject()) and
-      // don't report a violation in ambiguous cases
-      strictcount(JSDoc d | d = f.getDocumentation() and d.getATag() instanceof JSDocParamTag) = 1
-select tag, "@param tag refers to non-existent parameter " + parmName + "."
\ No newline at end of file
+where
+  doc = f.getDocumentation() and
+  tag = doc.getATag() and
+  parmName = tag.getName() and
+  tag.documentsSimpleName() and
+  not exists(f.getParameterByName(parmName)) and
+  // don't report functions without declared parameters that use `arguments`
+  not (f.getNumParameter() = 0 and f.usesArgumentsObject()) and
+  // don't report a violation in ambiguous cases
+  strictcount(JSDoc d | d = f.getDocumentation() and d.getATag() instanceof JSDocParamTag) = 1
+select tag, "@param tag refers to non-existent parameter " + parmName + "."
diff --git a/javascript/ql/src/JSDoc/UndocumentedParameter.ql b/javascript/ql/src/JSDoc/UndocumentedParameter.ql
index 8fdce73b3a9d..ec0a895fd260 100644
--- a/javascript/ql/src/JSDoc/UndocumentedParameter.ql
+++ b/javascript/ql/src/JSDoc/UndocumentedParameter.ql
@@ -14,13 +14,14 @@
 import javascript
 
 from Function f, Parameter parm, Variable v, JSDoc doc
-where parm = f.getAParameter() and
-      doc = f.getDocumentation() and
-      v = parm.getAVariable() and
-      // at least one parameter is documented
-      exists(doc.getATag().(JSDocParamTag).getDocumentedParameter()) and
-      // but v is not
-      not doc.getATag().(JSDocParamTag).getDocumentedParameter() = v and
-      // don't report a violation in ambiguous cases
-      strictcount(JSDoc d | d = f.getDocumentation() and d.getATag() instanceof JSDocParamTag) = 1
-select parm, "Parameter " + v.getName() + " is not documented."
\ No newline at end of file
+where
+  parm = f.getAParameter() and
+  doc = f.getDocumentation() and
+  v = parm.getAVariable() and
+  // at least one parameter is documented
+  exists(doc.getATag().(JSDocParamTag).getDocumentedParameter()) and
+  // but v is not
+  not doc.getATag().(JSDocParamTag).getDocumentedParameter() = v and
+  // don't report a violation in ambiguous cases
+  strictcount(JSDoc d | d = f.getDocumentation() and d.getATag() instanceof JSDocParamTag) = 1
+select parm, "Parameter " + v.getName() + " is not documented."
diff --git a/javascript/ql/src/JSDoc/UnknownTagType.ql b/javascript/ql/src/JSDoc/UnknownTagType.ql
index e6e4e2f75ce9..c30e9dd688af 100644
--- a/javascript/ql/src/JSDoc/UnknownTagType.ql
+++ b/javascript/ql/src/JSDoc/UnknownTagType.ql
@@ -136,4 +136,4 @@ predicate knownTagType(string tp) {
 
 from JSDocTag tag
 where not knownTagType(tag.getTitle())
-select tag, "Unknown tag type '" + tag.getTitle() + "'."
\ No newline at end of file
+select tag, "Unknown tag type '" + tag.getTitle() + "'."
diff --git a/javascript/ql/src/JSLint/InvalidJSLintDirective.ql b/javascript/ql/src/JSLint/InvalidJSLintDirective.ql
index f1d64428d9ec..f5a7a73d6fbd 100644
--- a/javascript/ql/src/JSLint/InvalidJSLintDirective.ql
+++ b/javascript/ql/src/JSLint/InvalidJSLintDirective.ql
@@ -13,6 +13,9 @@
 import javascript
 
 from SlashStarComment c
-where // use possessive quantifiers '*+' and '++' to avoid backtracking
-      c.getText().regexpMatch("\\s+(global|properties|property|jslint)\\s(\\s*+[a-zA-Z$_][a-zA-Z0-9$_]*+(\\s*+:\\s*+\\w++)?\\s*+,?)++\\s*")
-select c, "JSLint directives must not have whitespace characters before the directive name."
\ No newline at end of file
+where
+  // use possessive quantifiers '*+' and '++' to avoid backtracking
+  c
+      .getText()
+      .regexpMatch("\\s+(global|properties|property|jslint)\\s(\\s*+[a-zA-Z$_][a-zA-Z0-9$_]*+(\\s*+:\\s*+\\w++)?\\s*+,?)++\\s*")
+select c, "JSLint directives must not have whitespace characters before the directive name."
diff --git a/javascript/ql/src/JSLint/MalformedJSLintDirective.ql b/javascript/ql/src/JSLint/MalformedJSLintDirective.ql
index e20543e39052..bf93cf756068 100644
--- a/javascript/ql/src/JSLint/MalformedJSLintDirective.ql
+++ b/javascript/ql/src/JSLint/MalformedJSLintDirective.ql
@@ -13,13 +13,14 @@
 import javascript
 
 from JSLintDirective dir, string flag, string flags, string directive
-where // a flag, optionally followed by a colon and a value, where the value may be
-      // a Boolean or a number
-      flag = "[a-zA-Z$_][a-zA-Z0-9$_]*(\\s*:\\s*(true|false|\\d+))?" and
-      // a non-empty, comma-separated list of flags
-      flags = "(" + flag + "\\s*,\\s*)*" + flag and
-      // a word (which is the directive's name), followed by a possibly empty list of flags
-      // note that there may be trailing whitespace, but no leading whitespace
-      directive = "\\s*\\w+\\s+(" + flags + ")?\\s*" and
-      not dir.getText().regexpMatch(directive)
-select dir, "Malformed JSLint directive."
\ No newline at end of file
+where
+  // a flag, optionally followed by a colon and a value, where the value may be
+  // a Boolean or a number
+  flag = "[a-zA-Z$_][a-zA-Z0-9$_]*(\\s*:\\s*(true|false|\\d+))?" and
+  // a non-empty, comma-separated list of flags
+  flags = "(" + flag + "\\s*,\\s*)*" + flag and
+  // a word (which is the directive's name), followed by a possibly empty list of flags
+  // note that there may be trailing whitespace, but no leading whitespace
+  directive = "\\s*\\w+\\s+(" + flags + ")?\\s*" and
+  not dir.getText().regexpMatch(directive)
+select dir, "Malformed JSLint directive."
diff --git a/javascript/ql/src/LanguageFeatures/ArgumentsCallerCallee.ql b/javascript/ql/src/LanguageFeatures/ArgumentsCallerCallee.ql
index 1e0ddb0325a3..fb7055d8f991 100644
--- a/javascript/ql/src/LanguageFeatures/ArgumentsCallerCallee.ql
+++ b/javascript/ql/src/LanguageFeatures/ArgumentsCallerCallee.ql
@@ -13,12 +13,13 @@
 import javascript
 
 from PropAccess acc, ArgumentsVariable args
-where acc.getBase() = args.getAnAccess() and
-      acc.getPropertyName().regexpMatch("caller|callee") and
-      // don't flag cases where the variable can never contain an arguments object
-      not exists (Function fn | args = fn.getVariable()) and
-      not exists (Parameter p | args = p.getAVariable()) and
-      // arguments.caller/callee in strict mode causes runtime errors,
-      // this is covered by the query 'Use of call stack introspection in strict mode'
-      not acc.getContainer().isStrict()
-select acc, "Avoid using arguments.caller and arguments.callee."
\ No newline at end of file
+where
+  acc.getBase() = args.getAnAccess() and
+  acc.getPropertyName().regexpMatch("caller|callee") and
+  // don't flag cases where the variable can never contain an arguments object
+  not exists(Function fn | args = fn.getVariable()) and
+  not exists(Parameter p | args = p.getAVariable()) and
+  // arguments.caller/callee in strict mode causes runtime errors,
+  // this is covered by the query 'Use of call stack introspection in strict mode'
+  not acc.getContainer().isStrict()
+select acc, "Avoid using arguments.caller and arguments.callee."
diff --git a/javascript/ql/src/LanguageFeatures/BadTypeof.ql b/javascript/ql/src/LanguageFeatures/BadTypeof.ql
index 16deb3f5e7be..74813100f58c 100644
--- a/javascript/ql/src/LanguageFeatures/BadTypeof.ql
+++ b/javascript/ql/src/LanguageFeatures/BadTypeof.ql
@@ -37,9 +37,9 @@ class EqOrSwitch extends ASTNode {
    * of `case 1:` in `switch (y) { case 1: ... }` are `y` and `1`.
    */
   Expr getAnOperand() {
-    result = ((EqualityTest)this).getAnOperand()
+    result = (this.(EqualityTest)).getAnOperand()
     or
-    exists (Case c | c = this |
+    exists(Case c | c = this |
       result = c.getSwitch().getExpr() or
       result = c.getExpr()
     )
@@ -47,7 +47,12 @@ class EqOrSwitch extends ASTNode {
 }
 
 from EqOrSwitch et, TypeofExpr typeof, ConstantString str
-where typeof = et.getAnOperand().getUnderlyingValue() and
-      str = et.getAnOperand().getUnderlyingValue() and
-      not str.getStringValue().regexpMatch("undefined|boolean|number|string|object|function|symbol|unknown|date|bigint")
-select typeof, "The result of this 'typeof' expression is compared to '$@', but the two can never be equal.", str, str.getStringValue()
+where
+  typeof = et.getAnOperand().getUnderlyingValue() and
+  str = et.getAnOperand().getUnderlyingValue() and
+  not str
+      .getStringValue()
+      .regexpMatch("undefined|boolean|number|string|object|function|symbol|unknown|date|bigint")
+select typeof,
+  "The result of this 'typeof' expression is compared to '$@', but the two can never be equal.",
+  str, str.getStringValue()
diff --git a/javascript/ql/src/LanguageFeatures/ConditionalComments.ql b/javascript/ql/src/LanguageFeatures/ConditionalComments.ql
index 0b39f371e941..255415c05640 100644
--- a/javascript/ql/src/LanguageFeatures/ConditionalComments.ql
+++ b/javascript/ql/src/LanguageFeatures/ConditionalComments.ql
@@ -15,4 +15,4 @@ import javascript
 
 from Comment c
 where c.getText().trim().matches("@cc\\_on%")
-select c, "Do not use conditional comments."
\ No newline at end of file
+select c, "Do not use conditional comments."
diff --git a/javascript/ql/src/LanguageFeatures/DebuggerStatement.ql b/javascript/ql/src/LanguageFeatures/DebuggerStatement.ql
index 69ce841c0fe9..6ffca36df7cd 100644
--- a/javascript/ql/src/LanguageFeatures/DebuggerStatement.ql
+++ b/javascript/ql/src/LanguageFeatures/DebuggerStatement.ql
@@ -14,4 +14,4 @@
 import javascript
 
 from DebuggerStmt ds
-select ds, "Do not use 'debugger'."
\ No newline at end of file
+select ds, "Do not use 'debugger'."
diff --git a/javascript/ql/src/LanguageFeatures/DeleteVar.ql b/javascript/ql/src/LanguageFeatures/DeleteVar.ql
index ff45b84cd5d9..ed3940a1c70c 100644
--- a/javascript/ql/src/LanguageFeatures/DeleteVar.ql
+++ b/javascript/ql/src/LanguageFeatures/DeleteVar.ql
@@ -15,4 +15,4 @@ import javascript
 
 from DeleteExpr del
 where not del.getOperand().stripParens() instanceof PropAccess
-select del, "Only properties should be deleted."
\ No newline at end of file
+select del, "Only properties should be deleted."
diff --git a/javascript/ql/src/LanguageFeatures/EmptyArrayInit.ql b/javascript/ql/src/LanguageFeatures/EmptyArrayInit.ql
index 48ae48112446..5b0d4bb9b856 100644
--- a/javascript/ql/src/LanguageFeatures/EmptyArrayInit.ql
+++ b/javascript/ql/src/LanguageFeatures/EmptyArrayInit.ql
@@ -22,9 +22,7 @@ import javascript
 class OmittedArrayElement extends ArrayExpr {
   int idx;
 
-  OmittedArrayElement() {
-    idx = min(int i | elementIsOmitted(i))
-  }
+  OmittedArrayElement() { idx = min(int i | elementIsOmitted(i)) }
 
   /**
    * Holds if this element is at the specified location.
@@ -33,11 +31,16 @@ class OmittedArrayElement extends ArrayExpr {
    * For more information, see
    * [LGTM locations](https://lgtm.com/help/ql/locations).
    */
-  predicate hasLocationInfo(string filepath, int startline, int startcolumn, int endline, int endcolumn) {
-    exists (Token pre, Location before, Location after |
-      idx = 0 and pre = getFirstToken() or
-      pre = getElement(idx-1).getLastToken().getNextToken() |
-      before = pre.getLocation() and after = pre.getNextToken().getLocation() and
+  predicate hasLocationInfo(
+    string filepath, int startline, int startcolumn, int endline, int endcolumn
+  ) {
+    exists(Token pre, Location before, Location after |
+      idx = 0 and pre = getFirstToken()
+      or
+      pre = getElement(idx - 1).getLastToken().getNextToken()
+    |
+      before = pre.getLocation() and
+      after = pre.getNextToken().getLocation() and
       before.hasLocationInfo(filepath, startline, startcolumn, _, _) and
       after.hasLocationInfo(_, _, _, endline, endcolumn)
     )
@@ -45,4 +48,4 @@ class OmittedArrayElement extends ArrayExpr {
 }
 
 from OmittedArrayElement ae
-select ae, "Avoid omitted array elements."
\ No newline at end of file
+select ae, "Avoid omitted array elements."
diff --git a/javascript/ql/src/LanguageFeatures/Eval.ql b/javascript/ql/src/LanguageFeatures/Eval.ql
index 93310c803db3..f1f753774c04 100644
--- a/javascript/ql/src/LanguageFeatures/Eval.ql
+++ b/javascript/ql/src/LanguageFeatures/Eval.ql
@@ -17,28 +17,22 @@ import javascript
  * A call to `new Function(...)`.
  */
 class NewFunction extends DataFlow::NewNode {
-  NewFunction() {
-    this = DataFlow::globalVarRef("Function").getAnInvocation()
-  }
+  NewFunction() { this = DataFlow::globalVarRef("Function").getAnInvocation() }
 }
 
 /**
  * A call to `eval`.
  */
 class EvalCall extends DataFlow::CallNode {
-  EvalCall() {
-    this = DataFlow::globalVarRef("eval").getACall()
-  }
+  EvalCall() { this = DataFlow::globalVarRef("eval").getACall() }
 }
 
 /**
  * A call to `new Function(...)` or `eval`.
  */
 class EvalUse extends DataFlow::Node {
-  EvalUse() {
-    this instanceof NewFunction or this instanceof EvalCall
-  }
+  EvalUse() { this instanceof NewFunction or this instanceof EvalCall }
 }
 
 from EvalUse eval
-select eval, "Do not use eval or the Function constructor."
\ No newline at end of file
+select eval, "Do not use eval or the Function constructor."
diff --git a/javascript/ql/src/LanguageFeatures/ExpressionClosures.ql b/javascript/ql/src/LanguageFeatures/ExpressionClosures.ql
index cbe9e2dd0dff..6c81cf90fc56 100644
--- a/javascript/ql/src/LanguageFeatures/ExpressionClosures.ql
+++ b/javascript/ql/src/LanguageFeatures/ExpressionClosures.ql
@@ -19,16 +19,25 @@ import javascript
  * is the recommended replacement.
  */
 predicate deprecated_feature(ASTNode nd, string type, string replacement) {
-  exists (FunctionExpr fe | fe = nd and fe.getBody() instanceof Expr |
+  exists(FunctionExpr fe | fe = nd and fe.getBody() instanceof Expr |
     type = "expression closures" and replacement = "arrow expressions"
-  ) or
-  nd instanceof LegacyLetExpr and type = "let expressions" and replacement = "let declarations" or
-  nd instanceof LegacyLetStmt and type = "let statements" and replacement = "let declarations" or
-  nd instanceof ForEachStmt and type = "for each statements" and replacement = "for of statements" or
-  nd.(ComprehensionExpr).isPostfix() and type = "postfix comprehensions" and replacement = "prefix comprehensions" or
-  nd.(ExprStmt).isDoubleColonMethod(_, _, _) and type = "double colon method declarations" and replacement = "standard method definitions"
+  )
+  or
+  nd instanceof LegacyLetExpr and type = "let expressions" and replacement = "let declarations"
+  or
+  nd instanceof LegacyLetStmt and type = "let statements" and replacement = "let declarations"
+  or
+  nd instanceof ForEachStmt and type = "for each statements" and replacement = "for of statements"
+  or
+  nd.(ComprehensionExpr).isPostfix() and
+  type = "postfix comprehensions" and
+  replacement = "prefix comprehensions"
+  or
+  nd.(ExprStmt).isDoubleColonMethod(_, _, _) and
+  type = "double colon method declarations" and
+  replacement = "standard method definitions"
 }
 
 from ASTNode depr, string type, string replacement
 where deprecated_feature(depr, type, replacement)
-select depr, "Use " + replacement + " instead of " + type + "."
\ No newline at end of file
+select depr, "Use " + replacement + " instead of " + type + "."
diff --git a/javascript/ql/src/LanguageFeatures/HTMLComments.ql b/javascript/ql/src/LanguageFeatures/HTMLComments.ql
index 2f0849762924..67195c7bead7 100644
--- a/javascript/ql/src/LanguageFeatures/HTMLComments.ql
+++ b/javascript/ql/src/LanguageFeatures/HTMLComments.ql
@@ -15,4 +15,4 @@
 import javascript
 
 from HtmlLineComment c
-select c, "Do not use HTML comments."
\ No newline at end of file
+select c, "Do not use HTML comments."
diff --git a/javascript/ql/src/LanguageFeatures/IllegalInvocation.ql b/javascript/ql/src/LanguageFeatures/IllegalInvocation.ql
index 58290a6fd19f..3593666e3ea3 100644
--- a/javascript/ql/src/LanguageFeatures/IllegalInvocation.ql
+++ b/javascript/ql/src/LanguageFeatures/IllegalInvocation.ql
@@ -19,7 +19,8 @@ import javascript
 predicate calls(DataFlow::InvokeNode cs, Function callee, string how) {
   callee = cs.getACallee() and
   (
-    cs instanceof DataFlow::CallNode and not cs.asExpr() instanceof SuperCall and
+    cs instanceof DataFlow::CallNode and
+    not cs.asExpr() instanceof SuperCall and
     how = "as a function"
     or
     cs instanceof DataFlow::NewNode and
@@ -48,17 +49,16 @@ predicate illegalInvocation(DataFlow::InvokeNode cs, Function callee, string cal
  */
 predicate isCallToFunction(DataFlow::InvokeNode ce) {
   ce instanceof DataFlow::CallNode and
-  exists (Function f | f = ce.getACallee() |
-    not f instanceof Constructor
-  )
+  exists(Function f | f = ce.getACallee() | not f instanceof Constructor)
 }
 
 from DataFlow::InvokeNode cs, Function callee, string calleeDesc, string how
-where illegalInvocation(cs, callee, calleeDesc, how) and
-      // filter out some easy cases
-      not isCallToFunction(cs) and
-      // conservatively only flag call sites where _all_ callees are illegal
-      forex (Function otherCallee | otherCallee = cs.getACallee() |
-        illegalInvocation(cs, otherCallee, _, _)
-      )
+where
+  illegalInvocation(cs, callee, calleeDesc, how) and
+  // filter out some easy cases
+  not isCallToFunction(cs) and
+  // conservatively only flag call sites where _all_ callees are illegal
+  forex(Function otherCallee | otherCallee = cs.getACallee() |
+    illegalInvocation(cs, otherCallee, _, _)
+  )
 select cs, "Illegal invocation of $@ " + how + ".", callee, calleeDesc
diff --git a/javascript/ql/src/LanguageFeatures/InconsistentNew.ql b/javascript/ql/src/LanguageFeatures/InconsistentNew.ql
index a9fa57cfce67..847d00ea8275 100644
--- a/javascript/ql/src/LanguageFeatures/InconsistentNew.ql
+++ b/javascript/ql/src/LanguageFeatures/InconsistentNew.ql
@@ -22,7 +22,7 @@ import semmle.javascript.RestrictedLocations
  * have to call itself using `new`, so that is what we look for.
  */
 predicate guardsAgainstMissingNew(Function f) {
-  exists (DataFlow::NewNode new |
+  exists(DataFlow::NewNode new |
     new.asExpr().getEnclosingFunction() = f and
     f = new.getACallee()
   )
@@ -38,7 +38,8 @@ predicate calls(DataFlow::InvokeNode cs, Function callee, int imprecision) {
   callee = cs.getACallee() and
   (
     // if global flow was used to derive the callee, we may be imprecise
-    if cs.isIndefinite("global") then
+    if cs.isIndefinite("global")
+    then
       // callees within the same file are probably genuine
       callee.getFile() = cs.getFile() and imprecision = 0
       or
@@ -65,9 +66,11 @@ Function getALikelyCallee(DataFlow::InvokeNode cs, boolean isNew) {
   not cs.isUncertain() and
   not whitelistedCall(cs) and
   not whitelistedCallee(result) and
-  (cs instanceof DataFlow::NewNode and isNew = true
-   or
-   cs instanceof DataFlow::CallNode and isNew = false)
+  (
+    cs instanceof DataFlow::NewNode and isNew = true
+    or
+    cs instanceof DataFlow::CallNode and isNew = false
+  )
 }
 
 /**
@@ -76,10 +79,12 @@ Function getALikelyCallee(DataFlow::InvokeNode cs, boolean isNew) {
  */
 predicate whitelistedCallee(Function f) {
   // externs are special, so don't flag them
-  f.inExternsFile() or
+  f.inExternsFile()
+  or
   // illegal constructor calls are flagged by query 'Illegal invocation',
   // so don't flag them
-  f instanceof Constructor or
+  f instanceof Constructor
+  or
   // if `f` itself guards against missing `new`, don't flag it
   guardsAgainstMissingNew(f)
 }
@@ -90,7 +95,8 @@ predicate whitelistedCallee(Function f) {
  */
 predicate whitelistedCall(DataFlow::CallNode call) {
   // super constructor calls behave more like `new`, so don't flag them
-  call.asExpr() instanceof SuperCall or
+  call.asExpr() instanceof SuperCall
+  or
   // don't flag if there is a receiver object
   exists(call.getReceiver())
 }
@@ -102,14 +108,19 @@ predicate whitelistedCall(DataFlow::CallNode call) {
  */
 DataFlow::InvokeNode getFirstInvocation(Function f, boolean isNew) {
   result = min(DataFlow::InvokeNode invk, string path, int line, int col |
-    f = getALikelyCallee(invk, isNew) and invk.hasLocationInfo(path, line, col, _, _) |
-    invk order by path, line, col
-  )
+      f = getALikelyCallee(invk, isNew) and invk.hasLocationInfo(path, line, col, _, _)
+    |
+      invk
+      order by
+        path, line, col
+    )
 }
 
 from Function f, DataFlow::NewNode new, DataFlow::CallNode call
-where new = getFirstInvocation(f, true) and
-      call = getFirstInvocation(f, false)
-select (FirstLineOf)f, capitalize(f.describe()) + " is sometimes invoked as a constructor " +
-      "(for example $@), and sometimes as a normal function (for example $@).",
-      new, "here", call, "here"
+where
+  new = getFirstInvocation(f, true) and
+  call = getFirstInvocation(f, false)
+select f.(FirstLineOf),
+  capitalize(f.describe()) + " is sometimes invoked as a constructor " +
+    "(for example $@), and sometimes as a normal function (for example $@).", new, "here", call,
+  "here"
diff --git a/javascript/ql/src/LanguageFeatures/InvalidPrototype.ql b/javascript/ql/src/LanguageFeatures/InvalidPrototype.ql
index 3397e77677b2..89dc7535c60b 100644
--- a/javascript/ql/src/LanguageFeatures/InvalidPrototype.ql
+++ b/javascript/ql/src/LanguageFeatures/InvalidPrototype.ql
@@ -32,8 +32,7 @@ predicate isProto(DataFlow::AnalyzedNode e) {
 }
 
 from DataFlow::AnalyzedNode proto
-where isProto(proto) and
-      forex (InferredType tp | tp = proto.getAType() |
-        tp instanceof PrimitiveType and tp != TTNull()
-      )
+where
+  isProto(proto) and
+  forex(InferredType tp | tp = proto.getAType() | tp instanceof PrimitiveType and tp != TTNull())
 select proto, "Values of type " + proto.ppTypes() + " cannot be used as prototypes."
diff --git a/javascript/ql/src/LanguageFeatures/JumpFromFinally.ql b/javascript/ql/src/LanguageFeatures/JumpFromFinally.ql
index e1bf946e7e61..06620741a77a 100644
--- a/javascript/ql/src/LanguageFeatures/JumpFromFinally.ql
+++ b/javascript/ql/src/LanguageFeatures/JumpFromFinally.ql
@@ -25,14 +25,15 @@ class Jump extends Stmt {
 
   /** Gets the target to which this jump refers. */
   Stmt getTarget() {
-    result = ((BreakOrContinueStmt)this).getTarget() or
-    result = ((Function)((ReturnStmt)this).getContainer()).getBody()
+    result = (this.(BreakOrContinueStmt)).getTarget() or
+    result = ((this.(ReturnStmt)).getContainer().(Function)).getBody()
   }
 }
 
 from TryStmt try, BlockStmt finally, Jump jump
-where finally = try.getFinally() and
-      jump.getContainer() = try.getContainer() and
-      jump.getParentStmt+() = finally and
-      finally.getParentStmt+() = jump.getTarget()
-select jump, "This statement jumps out of the finally block, potentially hiding an exception."
\ No newline at end of file
+where
+  finally = try.getFinally() and
+  jump.getContainer() = try.getContainer() and
+  jump.getParentStmt+() = finally and
+  finally.getParentStmt+() = jump.getTarget()
+select jump, "This statement jumps out of the finally block, potentially hiding an exception."
diff --git a/javascript/ql/src/LanguageFeatures/LengthComparisonOffByOne.ql b/javascript/ql/src/LanguageFeatures/LengthComparisonOffByOne.ql
index a9326e5fc4a3..e3935386289a 100644
--- a/javascript/ql/src/LanguageFeatures/LengthComparisonOffByOne.ql
+++ b/javascript/ql/src/LanguageFeatures/LengthComparisonOffByOne.ql
@@ -17,17 +17,15 @@ import javascript
 /**
  * Gets an access to `array.length`.
  */
-PropAccess arrayLen(Variable array) {
-  result.accesses(array.getAnAccess(), "length")
-}
+PropAccess arrayLen(Variable array) { result.accesses(array.getAnAccess(), "length") }
 
 /**
  * Gets a condition that checks that `index` is less than or equal to `array.length`.
  */
 ConditionGuardNode getLengthLEGuard(Variable index, Variable array) {
-  exists (RelationalComparison cmp |
-    cmp instanceof GEExpr or cmp instanceof LEExpr |
-    cmp = result.getTest() and result.getOutcome() = true and
+  exists(RelationalComparison cmp | cmp instanceof GEExpr or cmp instanceof LEExpr |
+    cmp = result.getTest() and
+    result.getOutcome() = true and
     cmp.getGreaterOperand() = arrayLen(array) and
     cmp.getLesserOperand() = index.getAnAccess()
   )
@@ -37,8 +35,9 @@ ConditionGuardNode getLengthLEGuard(Variable index, Variable array) {
  * Gets a condition that checks that `index` is not equal to `array.length`.
  */
 ConditionGuardNode getLengthNEGuard(Variable index, Variable array) {
-  exists (EqualityTest eq |
-    eq = result.getTest() and result.getOutcome() = eq.getPolarity().booleanNot() and
+  exists(EqualityTest eq |
+    eq = result.getTest() and
+    result.getOutcome() = eq.getPolarity().booleanNot() and
     eq.hasOperands(index.getAnAccess(), arrayLen(array))
   )
 }
@@ -54,12 +53,14 @@ predicate elementRead(IndexExpr ea, Variable array, Variable index, BasicBlock b
 }
 
 from ConditionGuardNode cond, Variable array, Variable index, IndexExpr ea, BasicBlock bb
-where // there is a comparison `index <= array.length`
-      cond = getLengthLEGuard(index, array) and
-      // there is a read from `array[index]`
-      elementRead(ea, array, index, bb) and
-      // and the read is guarded by the comparison
-      cond.dominates(bb) and
-      // but the read is not guarded by another check that `index != array.length`
-      not getLengthNEGuard(index, array).dominates(bb)
-select cond.getTest(), "Off-by-one index comparison against length may lead to out-of-bounds $@.", ea, "read"
\ No newline at end of file
+where
+  // there is a comparison `index <= array.length`
+  cond = getLengthLEGuard(index, array) and
+  // there is a read from `array[index]`
+  elementRead(ea, array, index, bb) and
+  // and the read is guarded by the comparison
+  cond.dominates(bb) and
+  // but the read is not guarded by another check that `index != array.length`
+  not getLengthNEGuard(index, array).dominates(bb)
+select cond.getTest(), "Off-by-one index comparison against length may lead to out-of-bounds $@.",
+  ea, "read"
diff --git a/javascript/ql/src/LanguageFeatures/MultilineStringLiteral.ql b/javascript/ql/src/LanguageFeatures/MultilineStringLiteral.ql
index 08b959b2a1ab..3da685f0ef1d 100644
--- a/javascript/ql/src/LanguageFeatures/MultilineStringLiteral.ql
+++ b/javascript/ql/src/LanguageFeatures/MultilineStringLiteral.ql
@@ -13,6 +13,7 @@
 import javascript
 
 from StringLiteral sl, Location l
-where l = sl.getLocation() and
-      l.getStartLine() != l.getEndLine()
-select sl, "Avoid multi-line string literals."
\ No newline at end of file
+where
+  l = sl.getLocation() and
+  l.getStartLine() != l.getEndLine()
+select sl, "Avoid multi-line string literals."
diff --git a/javascript/ql/src/LanguageFeatures/NonLinearPattern.ql b/javascript/ql/src/LanguageFeatures/NonLinearPattern.ql
index 55b211cf649b..faa5392806e1 100644
--- a/javascript/ql/src/LanguageFeatures/NonLinearPattern.ql
+++ b/javascript/ql/src/LanguageFeatures/NonLinearPattern.ql
@@ -15,8 +15,11 @@
 import javascript
 
 from BindingPattern p, string n, VarDecl v, VarDecl w
-where v = p.getABindingVarRef() and w = p.getABindingVarRef() and
-      v.getName() = n and w.getName() = n and
-      v != w and
-      v.getLocation().startsBefore(w.getLocation())
+where
+  v = p.getABindingVarRef() and
+  w = p.getABindingVarRef() and
+  v.getName() = n and
+  w.getName() = n and
+  v != w and
+  v.getLocation().startsBefore(w.getLocation())
 select w, "Repeated binding of pattern variable '" + n + "' previously bound $@.", v, "here"
diff --git a/javascript/ql/src/LanguageFeatures/OctalLiteral.ql b/javascript/ql/src/LanguageFeatures/OctalLiteral.ql
index 3a5428f55729..a09406579d50 100644
--- a/javascript/ql/src/LanguageFeatures/OctalLiteral.ql
+++ b/javascript/ql/src/LanguageFeatures/OctalLiteral.ql
@@ -14,4 +14,4 @@ import javascript
 
 from NumberLiteral nl
 where nl.getRawValue().regexpMatch("0\\d+")
-select nl, "Do not use octal literals."
\ No newline at end of file
+select nl, "Do not use octal literals."
diff --git a/javascript/ql/src/LanguageFeatures/PropertyWriteOnPrimitive.ql b/javascript/ql/src/LanguageFeatures/PropertyWriteOnPrimitive.ql
index 07f1e2c7082e..19d372f65290 100644
--- a/javascript/ql/src/LanguageFeatures/PropertyWriteOnPrimitive.ql
+++ b/javascript/ql/src/LanguageFeatures/PropertyWriteOnPrimitive.ql
@@ -22,12 +22,14 @@ string describeProp(DataFlow::PropWrite pwn) {
 }
 
 from DataFlow::PropWrite pwn, DataFlow::AnalyzedNode base
-where base = pwn.getBase() and
-      forex (InferredType tp | tp = base.getAType() |
-        tp instanceof PrimitiveType and
-        // assignments on `null` and `undefined` are covered by
-        // the query 'Property access on null or undefined'
-        tp != TTNull() and tp != TTUndefined()
-      )
-select base, "Assignment to " + describeProp(pwn) +
-             " of a primitive value with type " + base.ppTypes() + "."
+where
+  base = pwn.getBase() and
+  forex(InferredType tp | tp = base.getAType() |
+    tp instanceof PrimitiveType and
+    // assignments on `null` and `undefined` are covered by
+    // the query 'Property access on null or undefined'
+    tp != TTNull() and
+    tp != TTUndefined()
+  )
+select base,
+  "Assignment to " + describeProp(pwn) + " of a primitive value with type " + base.ppTypes() + "."
diff --git a/javascript/ql/src/LanguageFeatures/ReservedWords.ql b/javascript/ql/src/LanguageFeatures/ReservedWords.ql
index 5f98790864a9..3cd45a2d7ad7 100644
--- a/javascript/ql/src/LanguageFeatures/ReservedWords.ql
+++ b/javascript/ql/src/LanguageFeatures/ReservedWords.ql
@@ -13,9 +13,12 @@
 import javascript
 
 from Identifier id
-where id.getName().regexpMatch("class|const|enum|export|extends|import|super|implements|interface|let|package|private|protected|public|static|yield") and
-      not exists(DotExpr de | id = de.getProperty()) and
-      not exists(Property prop | id = prop.getNameExpr()) and
-      // exclude JSX attribute names
-      not exists(JSXElement e | id = e.getAnAttribute().getNameExpr())
-select id, "Identifier name is a reserved word."
\ No newline at end of file
+where
+  id
+      .getName()
+      .regexpMatch("class|const|enum|export|extends|import|super|implements|interface|let|package|private|protected|public|static|yield") and
+  not exists(DotExpr de | id = de.getProperty()) and
+  not exists(Property prop | id = prop.getNameExpr()) and
+  // exclude JSX attribute names
+  not exists(JSXElement e | id = e.getAnAttribute().getNameExpr())
+select id, "Identifier name is a reserved word."
diff --git a/javascript/ql/src/LanguageFeatures/SemicolonInsertion.ql b/javascript/ql/src/LanguageFeatures/SemicolonInsertion.ql
index fc52539be8db..3f99062112da 100644
--- a/javascript/ql/src/LanguageFeatures/SemicolonInsertion.ql
+++ b/javascript/ql/src/LanguageFeatures/SemicolonInsertion.ql
@@ -20,23 +20,24 @@ import semmle.javascript.RestrictedLocations
  * is `false`.
  */
 predicate asi(StmtContainer sc, Stmt s, boolean asi) {
-    exists (TopLevel tl | tl = sc.getTopLevel() |
-      not tl instanceof EventHandlerCode and
-      not tl.isExterns()
-    ) and
-    sc = s.getContainer() and
-    s.isSubjectToSemicolonInsertion() and
-    (if s.hasSemicolonInserted() then asi = true else asi = false)
+  exists(TopLevel tl | tl = sc.getTopLevel() |
+    not tl instanceof EventHandlerCode and
+    not tl.isExterns()
+  ) and
+  sc = s.getContainer() and
+  s.isSubjectToSemicolonInsertion() and
+  (if s.hasSemicolonInserted() then asi = true else asi = false)
 }
 
 from Stmt s, StmtContainer sc, string sctype, float asi, int nstmt, int perc
-where s.hasSemicolonInserted() and
-      sc = s.getContainer() and
-      (if sc instanceof Function then sctype = "function" else sctype = "script") and
-      asi = strictcount(Stmt ss | asi(sc, ss, true)) and
-      nstmt = strictcount(Stmt ss | asi(sc, ss, _)) and
-      perc = ((1-asi/nstmt)*100).floor() and
-      perc >= 90
-select (LastLineOf)s, "Avoid automated semicolon insertion " +
-                      "(" + perc + "% of all statements in $@ have an explicit semicolon).",
-                      sc, "the enclosing " + sctype
\ No newline at end of file
+where
+  s.hasSemicolonInserted() and
+  sc = s.getContainer() and
+  (if sc instanceof Function then sctype = "function" else sctype = "script") and
+  asi = strictcount(Stmt ss | asi(sc, ss, true)) and
+  nstmt = strictcount(Stmt ss | asi(sc, ss, _)) and
+  perc = ((1 - asi / nstmt) * 100).floor() and
+  perc >= 90
+select s.(LastLineOf),
+  "Avoid automated semicolon insertion " + "(" + perc +
+    "% of all statements in $@ have an explicit semicolon).", sc, "the enclosing " + sctype
diff --git a/javascript/ql/src/LanguageFeatures/SetterIgnoresParameter.ql b/javascript/ql/src/LanguageFeatures/SetterIgnoresParameter.ql
index e184cd07a836..4f1758d2cd8a 100644
--- a/javascript/ql/src/LanguageFeatures/SetterIgnoresParameter.ql
+++ b/javascript/ql/src/LanguageFeatures/SetterIgnoresParameter.ql
@@ -15,11 +15,15 @@ import javascript
 import semmle.javascript.RestrictedLocations
 
 from PropertySetter s, FunctionExpr f, SimpleParameter p
-where f = s.getInit() and
-      p = f.getAParameter() and
-      not exists (p.getVariable().getAnAccess()) and
-      not f.usesArgumentsObject() and
-      // the setter body is either empty, or it is not just a single 'throw' statement
-      (not exists(f.getABodyStmt()) or
-       exists (Stmt stmt | stmt = f.getABodyStmt() | not stmt instanceof ThrowStmt))
-select (FirstLineOf)s, "This setter function does not use its parameter $@.", p, p.getName()
\ No newline at end of file
+where
+  f = s.getInit() and
+  p = f.getAParameter() and
+  not exists(p.getVariable().getAnAccess()) and
+  not f.usesArgumentsObject() and
+  // the setter body is either empty, or it is not just a single 'throw' statement
+  (
+    not exists(f.getABodyStmt())
+    or
+    exists(Stmt stmt | stmt = f.getABodyStmt() | not stmt instanceof ThrowStmt)
+  )
+select s.(FirstLineOf), "This setter function does not use its parameter $@.", p, p.getName()
diff --git a/javascript/ql/src/LanguageFeatures/SetterReturn.ql b/javascript/ql/src/LanguageFeatures/SetterReturn.ql
index 1bcb79359b23..0333246a4391 100644
--- a/javascript/ql/src/LanguageFeatures/SetterReturn.ql
+++ b/javascript/ql/src/LanguageFeatures/SetterReturn.ql
@@ -13,7 +13,8 @@
 import javascript
 
 from FunctionExpr f, ReturnStmt ret
-where ret.getContainer() = f and
-      f.isSetter() and
-      exists (ret.getExpr())
-select ret, "Useless return statement in setter function."
\ No newline at end of file
+where
+  ret.getContainer() = f and
+  f.isSetter() and
+  exists(ret.getExpr())
+select ret, "Useless return statement in setter function."
diff --git a/javascript/ql/src/LanguageFeatures/SpuriousArguments.ql b/javascript/ql/src/LanguageFeatures/SpuriousArguments.ql
index 1b882622b419..fb4c63290e5d 100644
--- a/javascript/ql/src/LanguageFeatures/SpuriousArguments.ql
+++ b/javascript/ql/src/LanguageFeatures/SpuriousArguments.ql
@@ -30,7 +30,7 @@ predicate isFixedArity(Function fn) {
  * This is only defined if all potential callees have a fixed arity.
  */
 int maxArity(DataFlow::InvokeNode invk) {
-  forall (Function callee | callee = invk.getACallee() | isFixedArity(callee)) and
+  forall(Function callee | callee = invk.getACallee() | isFixedArity(callee)) and
   result = max(invk.getACallee().getNumParameter())
 }
 
@@ -52,9 +52,7 @@ class SpuriousArguments extends Expr {
   /**
    * Gets the call site at which the spurious arguments are passed.
    */
-  DataFlow::InvokeNode getCall() {
-    result = invk
-  }
+  DataFlow::InvokeNode getCall() { result = invk }
 
   /**
    * Gets the number of spurious arguments, that is, the number of
@@ -72,25 +70,29 @@ class SpuriousArguments extends Expr {
    * For more information, see
    * [LGTM locations](https://lgtm.com/help/ql/locations).
    */
-  predicate hasLocationInfo(string filepath, int startline, int startcolumn, int endline, int endcolumn) {
+  predicate hasLocationInfo(
+    string filepath, int startline, int startcolumn, int endline, int endcolumn
+  ) {
     getLocation().hasLocationInfo(filepath, startline, startcolumn, _, _) and
-    exists (DataFlow::Node lastArg |
-      lastArg = max(DataFlow::Node arg, int i | arg = invk.getArgument(i) | arg order by i) |
+    exists(DataFlow::Node lastArg |
+      lastArg = max(DataFlow::Node arg, int i | arg = invk.getArgument(i) | arg order by i)
+    |
       lastArg.hasLocationInfo(_, _, _, endline, endcolumn)
     )
   }
 }
 
 from SpuriousArguments args, Function f, string arguments
-where f = args.getCall().getACallee() and
-      if args.getCount() = 1 then arguments = "argument" else arguments = "arguments" and
-      (
-        // exclude empty functions, they are probably commented out debug utilities ...
-        exists(f.getABodyStmt()) or
-        // ... but include: constructors, arrows and externals/ambients
-        f instanceof Constructor or // unlikely to be a debug utility
-        f instanceof ArrowFunctionExpr or // cannot be empty
-        f instanceof ExternalFunction or // always empty
-        f.isAmbient() // always empty
-      )
+where
+  f = args.getCall().getACallee() and
+  if args.getCount() = 1 then arguments = "argument" else arguments = "arguments" and
+  (
+    // exclude empty functions, they are probably commented out debug utilities ...
+    exists(f.getABodyStmt()) or
+    // ... but include: constructors, arrows and externals/ambients
+    f instanceof Constructor or // unlikely to be a debug utility
+    f instanceof ArrowFunctionExpr or // cannot be empty
+    f instanceof ExternalFunction or // always empty
+    f.isAmbient() // always empty
+  )
 select args, "Superfluous " + arguments + " passed to $@.", f, f.describe()
diff --git a/javascript/ql/src/LanguageFeatures/StrictModeCallStackIntrospection.ql b/javascript/ql/src/LanguageFeatures/StrictModeCallStackIntrospection.ql
index f7d510a00b2f..69bc5ac70c45 100644
--- a/javascript/ql/src/LanguageFeatures/StrictModeCallStackIntrospection.ql
+++ b/javascript/ql/src/LanguageFeatures/StrictModeCallStackIntrospection.ql
@@ -18,16 +18,19 @@ import javascript
  * code; `baseDesc` is a description of `baseVal` used in the alert message.
  */
 predicate illegalPropAccess(AbstractValue baseVal, string baseDesc, string prop) {
-  baseVal instanceof AbstractArguments and baseDesc = "arguments" and
+  baseVal instanceof AbstractArguments and
+  baseDesc = "arguments" and
   (prop = "caller" or prop = "callee")
   or
-  baseVal instanceof AbstractFunction and baseDesc = "Function.prototype" and
+  baseVal instanceof AbstractFunction and
+  baseDesc = "Function.prototype" and
   (prop = "caller" or prop = "arguments")
 }
 
 from PropAccess acc, DataFlow::AnalyzedNode baseNode, string base, string prop
-where acc.accesses(baseNode.asExpr(), prop) and
-      acc.getContainer().isStrict() and
-      illegalPropAccess(baseNode.getAValue(), base, prop) and
-      forex (AbstractValue av | av = baseNode.getAValue() | illegalPropAccess(av, _, prop))
-select acc, "Strict mode code cannot use " + base + "." + prop + "."
\ No newline at end of file
+where
+  acc.accesses(baseNode.asExpr(), prop) and
+  acc.getContainer().isStrict() and
+  illegalPropAccess(baseNode.getAValue(), base, prop) and
+  forex(AbstractValue av | av = baseNode.getAValue() | illegalPropAccess(av, _, prop))
+select acc, "Strict mode code cannot use " + base + "." + prop + "."
diff --git a/javascript/ql/src/LanguageFeatures/SyntaxError.ql b/javascript/ql/src/LanguageFeatures/SyntaxError.ql
index 75c4bbd703e7..4d0a21a96619 100644
--- a/javascript/ql/src/LanguageFeatures/SyntaxError.ql
+++ b/javascript/ql/src/LanguageFeatures/SyntaxError.ql
@@ -13,4 +13,4 @@
 import javascript
 
 from JSParseError pe
-select pe, pe.getMessage()
\ No newline at end of file
+select pe, pe.getMessage()
diff --git a/javascript/ql/src/LanguageFeatures/TemplateSyntaxInStringLiteral.ql b/javascript/ql/src/LanguageFeatures/TemplateSyntaxInStringLiteral.ql
index f20b85a99474..efc300e1974f 100644
--- a/javascript/ql/src/LanguageFeatures/TemplateSyntaxInStringLiteral.ql
+++ b/javascript/ql/src/LanguageFeatures/TemplateSyntaxInStringLiteral.ql
@@ -7,19 +7,18 @@
  * @precision high
  * @tags correctness
  */
- 
+
 import javascript
 
 /** A toplevel that contains at least one template literal. */
 class CandidateTopLevel extends TopLevel {
-  CandidateTopLevel() {
-    exists (TemplateLiteral template | template.getTopLevel() = this)
-  }
+  CandidateTopLevel() { exists(TemplateLiteral template | template.getTopLevel() = this) }
 }
 
 /** A string literal in a toplevel that contains at least one template literal. */
 class CandidateStringLiteral extends StringLiteral {
   CandidateTopLevel tl;
+
   string v;
 
   CandidateStringLiteral() {
@@ -46,8 +45,9 @@ class CandidateStringLiteral extends StringLiteral {
    * stepping over scope elements.
    */
   ASTNode getIntermediate() {
-    result = this or
-    exists (ASTNode mid | mid = getIntermediate() |
+    result = this
+    or
+    exists(ASTNode mid | mid = getIntermediate() |
       not mid instanceof ScopeElement and
       result = mid.getParent()
     )
@@ -62,7 +62,6 @@ class CandidateStringLiteral extends StringLiteral {
   }
 }
 
-
 /**
  * Holds if `obj` has a property for each template variable in `lit` and they occur as arguments
  * to the same call.
@@ -76,14 +75,12 @@ class CandidateStringLiteral extends StringLiteral {
  * ```
  */
 predicate providesTemplateVariablesFor(ObjectExpr obj, CandidateStringLiteral lit) {
-  exists (CallExpr call | call.getAnArgument() = obj and call.getAnArgument() = lit) and
-  forex (string name | lit.getAReferencedVariable() = name | hasProperty(obj, name))
+  exists(CallExpr call | call.getAnArgument() = obj and call.getAnArgument() = lit) and
+  forex(string name | lit.getAReferencedVariable() = name | hasProperty(obj, name))
 }
 
 /** Holds if `object` has a property with the given `name`. */
-predicate hasProperty(ObjectExpr object, string name) {
-  name = object.getAProperty().getName()
-}
+predicate hasProperty(ObjectExpr object, string name) { name = object.getAProperty().getName() }
 
 /**
  * Gets a declaration of variable `v` in `tl`, where `v` has the given `name` and
@@ -97,10 +94,11 @@ VarDecl getDeclIn(Variable v, Scope s, string name, CandidateTopLevel tl) {
 }
 
 from CandidateStringLiteral lit, Variable v, Scope s, string name, VarDecl decl
-where decl = getDeclIn(v, s, name, lit.getTopLevel())
-  and lit.getAReferencedVariable() = name
-  and lit.isInScope(s)
-  and not exists (ObjectExpr obj | providesTemplateVariablesFor(obj, lit))
-  and not lit.getStringValue() = "${" + name + "}"
-select lit, "This string is not a template literal, but appears to reference the variable $@.", 
-    decl, v.getName()
+where
+  decl = getDeclIn(v, s, name, lit.getTopLevel()) and
+  lit.getAReferencedVariable() = name and
+  lit.isInScope(s) and
+  not exists(ObjectExpr obj | providesTemplateVariablesFor(obj, lit)) and
+  not lit.getStringValue() = "${" + name + "}"
+select lit, "This string is not a template literal, but appears to reference the variable $@.",
+  decl, v.getName()
diff --git a/javascript/ql/src/LanguageFeatures/ThisBeforeSuper.ql b/javascript/ql/src/LanguageFeatures/ThisBeforeSuper.ql
index 66026fc83fc2..75317faf7f09 100644
--- a/javascript/ql/src/LanguageFeatures/ThisBeforeSuper.ql
+++ b/javascript/ql/src/LanguageFeatures/ThisBeforeSuper.ql
@@ -30,12 +30,12 @@ predicate needsGuard(Expr e, string kind) {
  * a `super` call.
  */
 predicate unguardedBB(BasicBlock bb, Function ctor) {
-  exists (ClassDefinition c | exists(c.getSuperClass()) |
+  exists(ClassDefinition c | exists(c.getSuperClass()) |
     ctor = c.getConstructor().getBody() and
     bb = ctor.getStartBB()
   )
   or
-  exists (BasicBlock pred | pred = bb.getAPredecessor() |
+  exists(BasicBlock pred | pred = bb.getAPredecessor() |
     unguardedBB(pred, ctor) and
     not pred.getANode() instanceof SuperCall
   )
@@ -47,17 +47,19 @@ predicate unguardedBB(BasicBlock bb, Function ctor) {
  * a `super` call.
  */
 predicate unguarded(ControlFlowNode nd, Function ctor) {
-  exists (BasicBlock bb, int i | nd = bb.getNode(i) |
+  exists(BasicBlock bb, int i | nd = bb.getNode(i) |
     unguardedBB(bb, ctor) and
-    not bb.getNode([0..i-1]) instanceof SuperCall
+    not bb.getNode([0 .. i - 1]) instanceof SuperCall
   )
 }
 
 from Expr e, string kind, Function ctor
-where needsGuard(e, kind) and unguarded(e, ctor) and
-      // don't flag if there is a super call in a nested arrow function
-      not exists (SuperCall sc |
-        sc.getBinder() = ctor and
-        sc.getEnclosingFunction() != ctor
-      )
-select (FirstLineOf)ctor, "The super constructor must be called before using '$@'.", e, kind
\ No newline at end of file
+where
+  needsGuard(e, kind) and
+  unguarded(e, ctor) and
+  // don't flag if there is a super call in a nested arrow function
+  not exists(SuperCall sc |
+    sc.getBinder() = ctor and
+    sc.getEnclosingFunction() != ctor
+  )
+select ctor.(FirstLineOf), "The super constructor must be called before using '$@'.", e, kind
diff --git a/javascript/ql/src/LanguageFeatures/TrailingComma.ql b/javascript/ql/src/LanguageFeatures/TrailingComma.ql
index 2e31f7c36a24..1f1784381c82 100644
--- a/javascript/ql/src/LanguageFeatures/TrailingComma.ql
+++ b/javascript/ql/src/LanguageFeatures/TrailingComma.ql
@@ -22,19 +22,16 @@ class ArrayOrObjectExpr extends Expr {
 
   /** Holds if this array or object expression has a trailing comma. */
   predicate hasTrailingComma() {
-    ((ArrayExpr)this).hasTrailingComma() or
-    ((ObjectExpr)this).hasTrailingComma()
+    (this.(ArrayExpr)).hasTrailingComma() or
+    (this.(ObjectExpr)).hasTrailingComma()
   }
 
   /** Gets a short description of this expression. */
   string getShortName() {
-    if this instanceof ArrayExpr then
-      result = "array expression"
-    else
-      result = "object expression"
+    if this instanceof ArrayExpr then result = "array expression" else result = "object expression"
   }
 }
 
 from ArrayOrObjectExpr e
 where e.hasTrailingComma()
-select e.getLastToken().getPreviousToken(), "Trailing comma in " + e.getShortName() + "."
\ No newline at end of file
+select e.getLastToken().getPreviousToken(), "Trailing comma in " + e.getShortName() + "."
diff --git a/javascript/ql/src/LanguageFeatures/WithStatement.ql b/javascript/ql/src/LanguageFeatures/WithStatement.ql
index 881454e402ce..cb2cfc728d8b 100644
--- a/javascript/ql/src/LanguageFeatures/WithStatement.ql
+++ b/javascript/ql/src/LanguageFeatures/WithStatement.ql
@@ -13,4 +13,4 @@ import javascript
 import semmle.javascript.RestrictedLocations
 
 from WithStmt ws
-select (FirstLineOf)ws, "Do not use 'with'."
+select ws.(FirstLineOf), "Do not use 'with'."
diff --git a/javascript/ql/src/LanguageFeatures/WrongExtensionJSON.ql b/javascript/ql/src/LanguageFeatures/WrongExtensionJSON.ql
index 972c29a02c1d..a3e73e921677 100644
--- a/javascript/ql/src/LanguageFeatures/WrongExtensionJSON.ql
+++ b/javascript/ql/src/LanguageFeatures/WrongExtensionJSON.ql
@@ -12,7 +12,8 @@
 import javascript
 
 from JSONValue v, File f
-where f = v.getFile() and
-      f.getExtension().regexpMatch("(?i)jsx?") and
-      not exists(v.getParent())
-select v, "JSON data in file with extension '" + f.getExtension() + "'."
\ No newline at end of file
+where
+  f = v.getFile() and
+  f.getExtension().regexpMatch("(?i)jsx?") and
+  not exists(v.getParent())
+select v, "JSON data in file with extension '" + f.getExtension() + "'."
diff --git a/javascript/ql/src/LanguageFeatures/YieldInNonGenerator.ql b/javascript/ql/src/LanguageFeatures/YieldInNonGenerator.ql
index 7c400046f318..f13c19ab6548 100644
--- a/javascript/ql/src/LanguageFeatures/YieldInNonGenerator.ql
+++ b/javascript/ql/src/LanguageFeatures/YieldInNonGenerator.ql
@@ -13,7 +13,8 @@
 import javascript
 
 from YieldExpr yield, Function f
-where f = yield.getEnclosingFunction() and
-      not f.isGenerator()
+where
+  f = yield.getEnclosingFunction() and
+  not f.isGenerator()
 select yield, "This yield expression is contained in $@ which is not marked as a generator.",
-       f.getFirstToken(), f.describe()
\ No newline at end of file
+  f.getFirstToken(), f.describe()
diff --git a/javascript/ql/src/Metrics/Dependencies/ExternalDependencies.ql b/javascript/ql/src/Metrics/Dependencies/ExternalDependencies.ql
index bd18a8a092aa..a63830647f13 100644
--- a/javascript/ql/src/Metrics/Dependencies/ExternalDependencies.ql
+++ b/javascript/ql/src/Metrics/Dependencies/ExternalDependencies.ql
@@ -13,5 +13,4 @@ import ExternalDependencies
 
 from File f, Dependency dep, string entity, int n
 where externalDependencies(f, dep, entity, n)
-select entity, n
-order by n desc
+select entity, n order by n desc
diff --git a/javascript/ql/src/Metrics/Dependencies/ExternalDependencies.qll b/javascript/ql/src/Metrics/Dependencies/ExternalDependencies.qll
index 53f62bf69c6c..d153d20b9b89 100644
--- a/javascript/ql/src/Metrics/Dependencies/ExternalDependencies.qll
+++ b/javascript/ql/src/Metrics/Dependencies/ExternalDependencies.qll
@@ -11,9 +11,8 @@ import semmle.javascript.dependencies.Dependencies
  * respectively, of `dep`.
  */
 predicate externalDependencies(File f, Dependency dep, string entity, int n) {
-  exists (string id, string v | dep.info(id, v) |
+  exists(string id, string v | dep.info(id, v) |
     entity = "/" + f.getRelativePath() + "<|>" + id + "<|>" + v
-  )
-  and
-  n = strictcount (Locatable use | use.getFile() = f and use = dep.getAUse(_))
-}
\ No newline at end of file
+  ) and
+  n = strictcount(Locatable use | use.getFile() = f and use = dep.getAUse(_))
+}
diff --git a/javascript/ql/src/Metrics/ES20xxFeatures.qll b/javascript/ql/src/Metrics/ES20xxFeatures.qll
index d3e76ff7a10c..ddc40d7f8df6 100644
--- a/javascript/ql/src/Metrics/ES20xxFeatures.qll
+++ b/javascript/ql/src/Metrics/ES20xxFeatures.qll
@@ -14,102 +14,124 @@ import javascript
  * (https://kangax.github.io/compat-table/esnext/).
  */
 predicate isES20xxFeature(ASTNode nd, int version, string category) {
-  version = 2015 and (
-   exists(nd.(Parameter).getDefault()) and category = "default function parameters" or
-   exists (Expr e | e = nd and
-     // synthetic constructors use rest/spread/super, but we don't want to count those
-     not e.getEnclosingFunction() instanceof SyntheticConstructor |
-     nd.(Parameter).isRestParameter() and
-     category = "rest parameters"
-     or
-     nd instanceof SpreadElement and
-     // spread properties are an ES2018 feature, see below
-     not nd = any(SpreadProperty sp).getInit() and
-     category = "spread (...) operator"
-     or
-     nd instanceof SuperExpr and category = "super"
-   ) or
-   exists (Property prop | prop = nd |
-     prop.getName() = "__proto__" or
-     prop.isShorthand() or
-     prop.isMethod() or
-     prop.isComputed()
-   ) and category = "object literal extensions" or
-   nd instanceof ForOfStmt and category = "for..of loops" or
-   nd.(Literal).getRawValue().regexpMatch("^0[bo].*") and category = "octal and binary literals" or
-   nd instanceof TemplateLiteral and category = "template literals" or
-   exists (RegExpLiteral rel | rel = nd |
-     rel.getFlags().regexpMatch(".*[yu].*") and
-     category = "RegExp \"y\" and \"u\" flags"
-   )
-   or
-   exists (VariableDeclarator vd | vd = nd |
-     vd.getBindingPattern() instanceof DestructuringPattern and
-     category = "destructuring declarations"
-   )
-   or
-   exists (AssignExpr assgn | assgn = nd |
-     assgn.getLhs().stripParens() instanceof DestructuringPattern and
-     category = "destructuring assignment"
-   )
-   or
-   (Parameter)nd instanceof DestructuringPattern and category = "destructuring parameters" or
-   exists (StringLiteral sl | sl = nd |
-     sl.getRawValue().regexpMatch(".*(?<!\\\\)\\\\u\\{[a-fA-F0-9]+\\}.*") and
-     category = "Unicode code point escapes"
-   )
-   or
-   nd instanceof NewTargetExpr and category = "new.target" or
-   nd instanceof ConstDeclStmt and category = "const" or
-   nd instanceof LetStmt and category = "let" or
-   nd instanceof ArrowFunctionExpr and category = "arrow functions" or
-   nd instanceof ClassDefinition and category = "class" or
-   nd.(Function).isGenerator() and category = "generators" or
-   nd instanceof YieldExpr and category = "generators" or
-   nd instanceof ES2015Module and category = "modules"
+  version = 2015 and
+  (
+    exists(nd.(Parameter).getDefault()) and category = "default function parameters"
+    or
+    exists(Expr e |
+      e = nd and
+      // synthetic constructors use rest/spread/super, but we don't want to count those
+      not e.getEnclosingFunction() instanceof SyntheticConstructor
+    |
+      nd.(Parameter).isRestParameter() and
+      category = "rest parameters"
+      or
+      nd instanceof SpreadElement and
+      // spread properties are an ES2018 feature, see below
+      not nd = any(SpreadProperty sp).getInit() and
+      category = "spread (...) operator"
+      or
+      nd instanceof SuperExpr and category = "super"
+    )
+    or
+    exists(Property prop | prop = nd |
+      prop.getName() = "__proto__" or
+      prop.isShorthand() or
+      prop.isMethod() or
+      prop.isComputed()
+    ) and
+    category = "object literal extensions"
+    or
+    nd instanceof ForOfStmt and category = "for..of loops"
+    or
+    nd.(Literal).getRawValue().regexpMatch("^0[bo].*") and category = "octal and binary literals"
+    or
+    nd instanceof TemplateLiteral and category = "template literals"
+    or
+    exists(RegExpLiteral rel | rel = nd |
+      rel.getFlags().regexpMatch(".*[yu].*") and
+      category = "RegExp \"y\" and \"u\" flags"
+    )
+    or
+    exists(VariableDeclarator vd | vd = nd |
+      vd.getBindingPattern() instanceof DestructuringPattern and
+      category = "destructuring declarations"
+    )
+    or
+    exists(AssignExpr assgn | assgn = nd |
+      assgn.getLhs().stripParens() instanceof DestructuringPattern and
+      category = "destructuring assignment"
+    )
+    or
+    nd.(Parameter) instanceof DestructuringPattern and category = "destructuring parameters"
+    or
+    exists(StringLiteral sl | sl = nd |
+      sl.getRawValue().regexpMatch(".*(?<!\\\\)\\\\u\\{[a-fA-F0-9]+\\}.*") and
+      category = "Unicode code point escapes"
+    )
+    or
+    nd instanceof NewTargetExpr and category = "new.target"
+    or
+    nd instanceof ConstDeclStmt and category = "const"
+    or
+    nd instanceof LetStmt and category = "let"
+    or
+    nd instanceof ArrowFunctionExpr and category = "arrow functions"
+    or
+    nd instanceof ClassDefinition and category = "class"
+    or
+    nd.(Function).isGenerator() and category = "generators"
+    or
+    nd instanceof YieldExpr and category = "generators"
+    or
+    nd instanceof ES2015Module and category = "modules"
   )
   or
-  version = 2016 and (
-   (nd instanceof ExpExpr or nd instanceof AssignExpExpr) and category = "exponentiation operator"
+  version = 2016 and
+  (
+    (nd instanceof ExpExpr or nd instanceof AssignExpExpr) and
+    category = "exponentiation operator"
   )
   or
-  version = 2017 and (
-   (nd.(Function).hasTrailingComma() or nd.(InvokeExpr).hasTrailingComma()) and
-   category = "trailing function comma"
-   or
-   (nd instanceof AwaitExpr or nd.(Function).isAsync()) and
-   category = "async/await"
+  version = 2017 and
+  (
+    (nd.(Function).hasTrailingComma() or nd.(InvokeExpr).hasTrailingComma()) and
+    category = "trailing function comma"
+    or
+    (nd instanceof AwaitExpr or nd.(Function).isAsync()) and
+    category = "async/await"
   )
   or
-  version = 2018 and (
-   nd.(RegExpLiteral).isDotAll() and
-   category = "'s' regular expression flag"
-   or
-   exists (TemplateElement te | te = nd | not te.hasValue()) and
-   category = "revised template literal syntax"
-   or
-   exists(nd.(ObjectPattern).getRest()) and
-   category = "rest properties"
-   or
-   nd instanceof SpreadProperty and
-   category = "spread properties"
-   or
-   (
-    nd.(ForOfStmt).isAwait()
-    or
-    exists (Function f | f = nd | f.isAsync() and f.isGenerator())
-   ) and
-   category = "asynchronous iteration"
-   or
-   exists (RegExpTerm ret | ret.getLiteral() = nd |
-     (ret.(RegExpGroup).isNamed() or exists(ret.(RegExpBackRef).getName())) and
-     category = "named capture groups"
-     or
-     ret instanceof RegExpLookbehind and
-     category = "lookbehind assertions"
-     or
-     ret instanceof RegExpUnicodePropertyEscape and
-     category = "Unicode property escapes"
-   )
+  version = 2018 and
+  (
+    nd.(RegExpLiteral).isDotAll() and
+    category = "'s' regular expression flag"
+    or
+    exists(TemplateElement te | te = nd | not te.hasValue()) and
+    category = "revised template literal syntax"
+    or
+    exists(nd.(ObjectPattern).getRest()) and
+    category = "rest properties"
+    or
+    nd instanceof SpreadProperty and
+    category = "spread properties"
+    or
+    (
+      nd.(ForOfStmt).isAwait()
+      or
+      exists(Function f | f = nd | f.isAsync() and f.isGenerator())
+    ) and
+    category = "asynchronous iteration"
+    or
+    exists(RegExpTerm ret | ret.getLiteral() = nd |
+      (ret.(RegExpGroup).isNamed() or exists(ret.(RegExpBackRef).getName())) and
+      category = "named capture groups"
+      or
+      ret instanceof RegExpLookbehind and
+      category = "lookbehind assertions"
+      or
+      ret instanceof RegExpUnicodePropertyEscape and
+      category = "Unicode property escapes"
+    )
   )
 }
diff --git a/javascript/ql/src/Metrics/FCommentRatio.ql b/javascript/ql/src/Metrics/FCommentRatio.ql
index ba47008d8516..cf0d4201c055 100644
--- a/javascript/ql/src/Metrics/FCommentRatio.ql
+++ b/javascript/ql/src/Metrics/FCommentRatio.ql
@@ -14,5 +14,4 @@ import javascript
 
 from File f, int n
 where n = strictsum(TopLevel tl | tl = f.getATopLevel() | tl.getNumberOfLines())
-select f, 100.0 * ((float)f.getNumberOfLinesOfComments() / (float)n) as ratio
-order by ratio desc
+select f, 100.0 * (f.getNumberOfLinesOfComments().(float) / n.(float)) as ratio order by ratio desc
diff --git a/javascript/ql/src/Metrics/FCyclomaticComplexity.ql b/javascript/ql/src/Metrics/FCyclomaticComplexity.ql
index 97a432aa84a8..a737832f3954 100644
--- a/javascript/ql/src/Metrics/FCyclomaticComplexity.ql
+++ b/javascript/ql/src/Metrics/FCyclomaticComplexity.ql
@@ -12,6 +12,11 @@
 
 import javascript
 
-from File f, float  n
-where n = avg(Function fun, int toAvg | fun.getTopLevel().getFile() = f and toAvg = fun.getCyclomaticComplexity() | toAvg)
-select f, n
\ No newline at end of file
+from File f, float n
+where
+  n = avg(Function fun, int toAvg |
+      fun.getTopLevel().getFile() = f and toAvg = fun.getCyclomaticComplexity()
+    |
+      toAvg
+    )
+select f, n
diff --git a/javascript/ql/src/Metrics/FFunctions.ql b/javascript/ql/src/Metrics/FFunctions.ql
index e5ad672ec239..d74cbcde7f32 100644
--- a/javascript/ql/src/Metrics/FFunctions.ql
+++ b/javascript/ql/src/Metrics/FFunctions.ql
@@ -13,5 +13,4 @@ import javascript
 
 from File f, int n
 where n = count(Function fun | fun.getTopLevel().getFile() = f)
-select f, n
-order by n desc
+select f, n order by n desc
diff --git a/javascript/ql/src/Metrics/FLines.ql b/javascript/ql/src/Metrics/FLines.ql
index 72a56d88a815..4fdd2ab9458f 100644
--- a/javascript/ql/src/Metrics/FLines.ql
+++ b/javascript/ql/src/Metrics/FLines.ql
@@ -13,5 +13,4 @@ import javascript
 
 from File f, int n
 where n = f.getNumberOfLines()
-select f, n
-order by n desc
+select f, n order by n desc
diff --git a/javascript/ql/src/Metrics/FLinesOfCode.ql b/javascript/ql/src/Metrics/FLinesOfCode.ql
index 519f2fa04c4e..52fb8447ef0b 100644
--- a/javascript/ql/src/Metrics/FLinesOfCode.ql
+++ b/javascript/ql/src/Metrics/FLinesOfCode.ql
@@ -15,5 +15,4 @@ import javascript
 
 from File f, int n
 where n = f.getNumberOfLinesOfCode()
-select f, n
-order by n desc
+select f, n order by n desc
diff --git a/javascript/ql/src/Metrics/FLinesOfComment.ql b/javascript/ql/src/Metrics/FLinesOfComment.ql
index 76770ce9c82e..6eb8b1594c36 100644
--- a/javascript/ql/src/Metrics/FLinesOfComment.ql
+++ b/javascript/ql/src/Metrics/FLinesOfComment.ql
@@ -12,7 +12,5 @@
 
 import javascript
 
-
 from File f
-select f, f.getNumberOfLinesOfComments() as n
-order by n desc
+select f, f.getNumberOfLinesOfComments() as n order by n desc
diff --git a/javascript/ql/src/Metrics/FLinesOfDuplicatedCode.ql b/javascript/ql/src/Metrics/FLinesOfDuplicatedCode.ql
index 8306ff74ec5c..ca323c8b18b1 100644
--- a/javascript/ql/src/Metrics/FLinesOfDuplicatedCode.ql
+++ b/javascript/ql/src/Metrics/FLinesOfDuplicatedCode.ql
@@ -21,20 +21,19 @@ import external.CodeDuplication
  * Currently, only lines on which an import declaration occurs are excluded.
  */
 predicate whitelistedLineForDuplication(File f, int l) {
-  exists (ImportDeclaration i | i.getFile() = f and i.getLocation().getStartLine() = l)
+  exists(ImportDeclaration i | i.getFile() = f and i.getLocation().getStartLine() = l)
 }
 
 /**
  * Holds if line `l` of file `f` belongs to a block of lines that is duplicated somewhere else.
  */
 predicate dupLine(int l, File f) {
-  exists (DuplicateBlock d | d.sourceFile() = f |
-    l in [d.sourceStartLine()..d.sourceEndLine()] and
+  exists(DuplicateBlock d | d.sourceFile() = f |
+    l in [d.sourceStartLine() .. d.sourceEndLine()] and
     not whitelistedLineForDuplication(f, l)
   )
 }
 
 from File f, int n
-where n = count (int l | dupLine(l, f))
-select f, n
-order by n desc
+where n = count(int l | dupLine(l, f))
+select f, n order by n desc
diff --git a/javascript/ql/src/Metrics/FLinesOfSimilarCode.ql b/javascript/ql/src/Metrics/FLinesOfSimilarCode.ql
index f035ef525c70..d088242ab1e7 100644
--- a/javascript/ql/src/Metrics/FLinesOfSimilarCode.ql
+++ b/javascript/ql/src/Metrics/FLinesOfSimilarCode.ql
@@ -21,12 +21,9 @@ import external.CodeDuplication
  * of lines appearing somewhere else.
  */
 predicate simLine(int l, File f) {
-  exists (SimilarBlock d | d.sourceFile() = f |
-    l in [d.sourceStartLine()..d.sourceEndLine()]
-  )
+  exists(SimilarBlock d | d.sourceFile() = f | l in [d.sourceStartLine() .. d.sourceEndLine()])
 }
 
 from File f, int n
-where n = count (int l | simLine(l, f))
-select f, n
-order by n desc
+where n = count(int l | simLine(l, f))
+select f, n order by n desc
diff --git a/javascript/ql/src/Metrics/FNumberOfStatements.ql b/javascript/ql/src/Metrics/FNumberOfStatements.ql
index 80a91a78d808..8346e46b72d3 100644
--- a/javascript/ql/src/Metrics/FNumberOfStatements.ql
+++ b/javascript/ql/src/Metrics/FNumberOfStatements.ql
@@ -13,5 +13,4 @@ import javascript
 
 from File f, int n
 where n = count(Stmt s | s.getTopLevel().getFile() = f)
-select f, n
-order by n desc
+select f, n order by n desc
diff --git a/javascript/ql/src/Metrics/FNumberOfTests.ql b/javascript/ql/src/Metrics/FNumberOfTests.ql
index 1fd8ab51b7c8..df1ef983ddcb 100644
--- a/javascript/ql/src/Metrics/FNumberOfTests.ql
+++ b/javascript/ql/src/Metrics/FNumberOfTests.ql
@@ -13,5 +13,4 @@ import semmle.javascript.frameworks.Testing
 
 from File f, int n
 where n = strictcount(Test test | test.getFile() = f)
-select f, n
-order by n desc
+select f, n order by n desc
diff --git a/javascript/ql/src/Metrics/FUseOfES6.ql b/javascript/ql/src/Metrics/FUseOfES6.ql
index 6d515e8d44d1..65bcfe844138 100644
--- a/javascript/ql/src/Metrics/FUseOfES6.ql
+++ b/javascript/ql/src/Metrics/FUseOfES6.ql
@@ -13,5 +13,4 @@
 import ES20xxFeatures
 
 from File f
-select f, count (ASTNode nd | nd.getFile() = f and isES20xxFeature(nd, _, _)) as n
-order by n desc
\ No newline at end of file
+select f, count(ASTNode nd | nd.getFile() = f and isES20xxFeature(nd, _, _)) as n order by n desc
diff --git a/javascript/ql/src/Metrics/FunCyclomaticComplexity.ql b/javascript/ql/src/Metrics/FunCyclomaticComplexity.ql
index 493fd5be1b9b..8856f16d29ae 100644
--- a/javascript/ql/src/Metrics/FunCyclomaticComplexity.ql
+++ b/javascript/ql/src/Metrics/FunCyclomaticComplexity.ql
@@ -14,5 +14,4 @@ import javascript
 
 from Function func, int complexity
 where complexity = func.getCyclomaticComplexity()
-select func, complexity
-order by complexity desc
\ No newline at end of file
+select func, complexity order by complexity desc
diff --git a/javascript/ql/src/Metrics/FunLinesOfCode.ql b/javascript/ql/src/Metrics/FunLinesOfCode.ql
index e2c78840c0f1..590ad76c7658 100644
--- a/javascript/ql/src/Metrics/FunLinesOfCode.ql
+++ b/javascript/ql/src/Metrics/FunLinesOfCode.ql
@@ -13,5 +13,4 @@
 import javascript
 
 from Function f
-select f, f.getNumberOfLinesOfCode() as n
-order by n desc
\ No newline at end of file
+select f, f.getNumberOfLinesOfCode() as n order by n desc
diff --git a/javascript/ql/src/NodeJS/CyclicImport.ql b/javascript/ql/src/NodeJS/CyclicImport.ql
index ca1ff8d5f054..7de04cf5b200 100644
--- a/javascript/ql/src/NodeJS/CyclicImport.ql
+++ b/javascript/ql/src/NodeJS/CyclicImport.ql
@@ -20,13 +20,14 @@ import javascript
  */
 string ppDiff(Container c1, Container c2) {
   relatedAncestors(c1, c2) and
-  if c1.getBaseName() = c2.getBaseName() then
-    result = ppDiff(c1.getParentContainer(), c2.getParentContainer()) + "/" + c1.getBaseName()
-  else if not exists(c1.getParentContainer()) or
-          sourceLocationPrefix(c1.getParentContainer().getAbsolutePath()) then
-    result = "/" + c1.getBaseName()
+  if c1.getBaseName() = c2.getBaseName()
+  then result = ppDiff(c1.getParentContainer(), c2.getParentContainer()) + "/" + c1.getBaseName()
   else
-    result = ".../" + c1.getBaseName()
+    if
+      not exists(c1.getParentContainer()) or
+      sourceLocationPrefix(c1.getParentContainer().getAbsolutePath())
+    then result = "/" + c1.getBaseName()
+    else result = ".../" + c1.getBaseName()
 }
 
 /**
@@ -36,9 +37,8 @@ string ppDiff(Container c1, Container c2) {
  * This predicate is used to restrict the domain of `ppDiff`.
  */
 predicate relatedAncestors(Container c1, Container c2) {
-  exists (NodeModule m, NodeModule n | relatedModules(m, n) |
-    c1 = m.getFile() and c2 = n.getFile()
-  ) or
+  exists(NodeModule m, NodeModule n | relatedModules(m, n) | c1 = m.getFile() and c2 = n.getFile())
+  or
   relatedAncestors(c1.(Folder).getAChildContainer(), c2.(Folder).getAChildContainer())
 }
 
@@ -50,10 +50,9 @@ predicate relatedAncestors(Container c1, Container c2) {
  */
 string pp(NodeModule m, NodeModule other) {
   relatedModules(m, other) and
-  if m.getName() = other.getName() and m != other then
-    result = ppDiff(m.getFile(), other.getFile())
-  else
-    result = m.getName()
+  if m.getName() = other.getName() and m != other
+  then result = ppDiff(m.getFile(), other.getFile())
+  else result = m.getName()
 }
 
 /**
@@ -65,24 +64,30 @@ predicate relatedModules(NodeModule m, NodeModule n) {
   n = m.getAnImportedModule() or m = n.getAnImportedModule()
 }
 
-from NodeModule m, Require r, NodeModule imported, string msg,
-     ASTNode linktarget, string linktext
-where r = m.getAnImport() and
-      imported = r.getImportedModule() and
-      if imported = m then
-        // set linktarget and linktext to dummy values in this case
-        (msg = "directly imports itself" and linktarget = m and linktext = "")
-      else
-        // find an import in `imported` that (directly or indirectly) imports `m`
-        exists (Require r2, Module imported2 | r2 = imported.getAnImport() and imported2 = r2.getImportedModule() |
-          imported2.getAnImportedModule*() = m and
-          msg = "imports module " + pp(imported, m) + ", which in turn $@ it" and
-          linktarget = r2 and
-          // check whether it is a direct or indirect import
-          (if imported2 = m then
-            linktext = "imports"
-           else
-            // only report indirect imports if there is no direct import
-            (linktext = "indirectly imports" and not imported.getAnImportedModule() = m))
+from NodeModule m, Require r, NodeModule imported, string msg, ASTNode linktarget, string linktext
+where
+  r = m.getAnImport() and
+  imported = r.getImportedModule() and
+  if imported = m
+  then (
+    // set linktarget and linktext to dummy values in this case
+    msg = "directly imports itself" and linktarget = m and linktext = ""
+  ) else
+    // find an import in `imported` that (directly or indirectly) imports `m`
+    exists(Require r2, Module imported2 |
+      r2 = imported.getAnImport() and imported2 = r2.getImportedModule()
+    |
+      imported2.getAnImportedModule*() = m and
+      msg = "imports module " + pp(imported, m) + ", which in turn $@ it" and
+      linktarget = r2 and
+      // check whether it is a direct or indirect import
+      (
+        if imported2 = m
+        then linktext = "imports"
+        else (
+          // only report indirect imports if there is no direct import
+          linktext = "indirectly imports" and not imported.getAnImportedModule() = m
         )
-select r, "Module " + pp(m, imported) + " " + msg + ".", linktarget, linktext
\ No newline at end of file
+      )
+    )
+select r, "Module " + pp(m, imported) + " " + msg + ".", linktarget, linktext
diff --git a/javascript/ql/src/NodeJS/DubiousImport.ql b/javascript/ql/src/NodeJS/DubiousImport.ql
index 7b4cdf3b148e..97ed336e22bc 100644
--- a/javascript/ql/src/NodeJS/DubiousImport.ql
+++ b/javascript/ql/src/NodeJS/DubiousImport.ql
@@ -16,22 +16,20 @@ import javascript
 predicate hasUntrackedExports(NodeModule m) {
   // look for assignments of the form `module.exports[p] = ...`, where we cannot
   // determine the name of the exported property being assigned
-  exists (DataFlow::PropWrite pwn |
+  exists(DataFlow::PropWrite pwn |
     pwn.getBase().analyze().getAValue() = m.getAModuleExportsValue() and
     not exists(pwn.getPropertyName())
   )
   or
   // look for assignments of the form `module.exports = exp` where `exp` is indefinite
-  exists (AbstractModuleObject am, AnalyzedPropertyWrite apw, DataFlow::AnalyzedNode exp |
+  exists(AbstractModuleObject am, AnalyzedPropertyWrite apw, DataFlow::AnalyzedNode exp |
     am.getModule() = m and
     apw.writes(am, "exports", exp) and
     exp.getAValue().isIndefinite(_)
   )
   or
   // look for function calls of the form `f(module.exports)`
-  exists (InvokeExpr invk |
-    invk.getAnArgument().analyze().getAValue() = m.getAModuleExportsValue()
-  )
+  exists(InvokeExpr invk | invk.getAnArgument().analyze().getAValue() = m.getAModuleExportsValue())
 }
 
 /**
@@ -39,7 +37,7 @@ predicate hasUntrackedExports(NodeModule m) {
  * a `require` import of module `m`.
  */
 predicate propDefinedOnRequire(NodeModule m, string prop) {
-  exists (DataFlow::ModuleImportNode imp |
+  exists(DataFlow::ModuleImportNode imp |
     imp.asExpr().(Require).getImportedModule() = m and
     exists(imp.getAPropertyWrite(prop))
   )
@@ -50,19 +48,21 @@ predicate propDefinedOnRequire(NodeModule m, string prop) {
  * a `require` import of module `m`.
  */
 predicate propAccessOn(PropAccess pacc, NodeModule m) {
-  exists (DataFlow::ModuleImportNode imp |
+  exists(DataFlow::ModuleImportNode imp |
     imp.asExpr().(Require).getImportedModule() = m and
     imp.flowsToExpr(pacc.getBase())
   )
 }
 
 from NodeModule m, PropAccess pacc, string prop
-where propAccessOn(pacc, m) and count(NodeModule mm | propAccessOn(pacc, mm)) = 1 and
-      prop = pacc.getPropertyName() and
-      // m doesn't export 'prop'
-      not prop = m.getAnExportedSymbol() and
-      // 'prop' isn't otherwise defined on m
-      not propDefinedOnRequire(m, prop) and
-      // m doesn't use complicated exports
-      not hasUntrackedExports(m)
-select pacc, "Module $@ does not export symbol " + prop + ".", m, m.getName()
\ No newline at end of file
+where
+  propAccessOn(pacc, m) and
+  count(NodeModule mm | propAccessOn(pacc, mm)) = 1 and
+  prop = pacc.getPropertyName() and
+  // m doesn't export 'prop'
+  not prop = m.getAnExportedSymbol() and
+  // 'prop' isn't otherwise defined on m
+  not propDefinedOnRequire(m, prop) and
+  // m doesn't use complicated exports
+  not hasUntrackedExports(m)
+select pacc, "Module $@ does not export symbol " + prop + ".", m, m.getName()
diff --git a/javascript/ql/src/NodeJS/InvalidExport.ql b/javascript/ql/src/NodeJS/InvalidExport.ql
index 756c5205fde0..df9a9b3387e4 100644
--- a/javascript/ql/src/NodeJS/InvalidExport.ql
+++ b/javascript/ql/src/NodeJS/InvalidExport.ql
@@ -17,7 +17,7 @@ import javascript
  * Holds if `assign` assigns the value of `nd` to `exportsVar`, which is an `exports` variable
  */
 predicate exportsAssign(Assignment assgn, Variable exportsVar, DataFlow::Node nd) {
-  exists (NodeModule m |
+  exists(NodeModule m |
     exportsVar = m.getScope().getVariable("exports") and
     assgn.getLhs() = exportsVar.getAnAccess() and
     nd = assgn.getRhs().flow()
@@ -38,12 +38,13 @@ predicate moduleExportsAssign(DataFlow::PropWrite pw, DataFlow::Node nd) {
 }
 
 from Assignment assgn, Variable exportsVar, DataFlow::Node exportsVal
-where exportsAssign(assgn, exportsVar, exportsVal) and
-      not exists(exportsVal.getAPredecessor()) and
-      not (
-        // this is OK if `exportsVal` flows into `module.exports`
-        moduleExportsAssign(_, exportsVal) and
-        // however, if there are no further uses of `exports` the assignment is useless anyway
-        strictcount (exportsVar.getAnAccess()) > 1
-      )
-select assgn, "Assigning to 'exports' does not export anything."
\ No newline at end of file
+where
+  exportsAssign(assgn, exportsVar, exportsVal) and
+  not exists(exportsVal.getAPredecessor()) and
+  not (
+    // this is OK if `exportsVal` flows into `module.exports`
+    moduleExportsAssign(_, exportsVal) and
+    // however, if there are no further uses of `exports` the assignment is useless anyway
+    strictcount(exportsVar.getAnAccess()) > 1
+  )
+select assgn, "Assigning to 'exports' does not export anything."
diff --git a/javascript/ql/src/NodeJS/MissingExports.ql b/javascript/ql/src/NodeJS/MissingExports.ql
index 788e907e3f0b..49938d198897 100644
--- a/javascript/ql/src/NodeJS/MissingExports.ql
+++ b/javascript/ql/src/NodeJS/MissingExports.ql
@@ -14,30 +14,26 @@ import javascript
 
 /** Holds if variable `v` is assigned somewhere in module `m`. */
 predicate definedInModule(GlobalVariable v, NodeModule m) {
-  exists (LValue def |
+  exists(LValue def |
     def.getTopLevel() = m and
     def.(Expr).accessesGlobal(v.getName())
   )
 }
 
 from NodeModule m, GlobalVariable f, InvokeExpr invk, ASTNode export, GlobalVarAccess acc
-where m.exports(f.getName(), export) and
-      acc = f.getAnAccess() and
-      invk.getCallee() = acc and
-      invk.getTopLevel() = m and
-
-      // don't flag if the variable is defined in the same module
-      not definedInModule(f, m) and
-
-      // don't flag if there is a linter directive declaring the variable
-      not exists (Linting::GlobalDeclaration glob |
-        glob.declaresGlobalForAccess(acc)
-      ) and
-
-      // don't flag if there is an externs declaration for the variable
-      not exists (ExternalGlobalDecl egd | egd.getName() = f.getName()) and
-
-      // don't flag if the invocation could refer to a property introduced by `with`
-      not exists (WithStmt with | with.mayAffect(invk.getCallee()))
-select invk, "'" + f.getName() + "' references an undeclared global variable, "
-     + "not the variable exported $@.", export, "here"
\ No newline at end of file
+where
+  m.exports(f.getName(), export) and
+  acc = f.getAnAccess() and
+  invk.getCallee() = acc and
+  invk.getTopLevel() = m and
+  // don't flag if the variable is defined in the same module
+  not definedInModule(f, m) and
+  // don't flag if there is a linter directive declaring the variable
+  not exists(Linting::GlobalDeclaration glob | glob.declaresGlobalForAccess(acc)) and
+  // don't flag if there is an externs declaration for the variable
+  not exists(ExternalGlobalDecl egd | egd.getName() = f.getName()) and
+  // don't flag if the invocation could refer to a property introduced by `with`
+  not exists(WithStmt with | with.mayAffect(invk.getCallee()))
+select invk,
+  "'" + f.getName() + "' references an undeclared global variable, " +
+    "not the variable exported $@.", export, "here"
diff --git a/javascript/ql/src/NodeJS/UnresolvableImport.ql b/javascript/ql/src/NodeJS/UnresolvableImport.ql
index 00ed20d59314..c478a5ebe9de 100644
--- a/javascript/ql/src/NodeJS/UnresolvableImport.ql
+++ b/javascript/ql/src/NodeJS/UnresolvableImport.ql
@@ -17,33 +17,32 @@ import javascript
  * file `f` belongs.
  */
 PackageJSON getClosestPackageJSON(Folder f) {
-  result = f.(NPMPackage).getPackageJSON() or
+  result = f.(NPMPackage).getPackageJSON()
+  or
   not f instanceof NPMPackage and result = getClosestPackageJSON(f.getParentContainer())
 }
 
 from Require r, string path, string mod
-where path = r.getImportedPath().getValue() and
-
-      // the imported module is the initial segment of the path, up to
-      // `/` or the end of the string, whichever comes first; we exclude
-      // local paths starting with `.` or `/`, since they might refer to files
-      // downloaded or generated during the build
-      mod = path.regexpCapture("([^./][^/]*)(/.*|$)", 1) and
-
-      // exclude WebPack/Require.js loaders
-      not mod.matches("%!%") and
-
-      // import cannot be resolved statically
-      not exists (r.getImportedModule()) and
-
-      // no enclosing NPM package declares a dependency on `mod`
-      forex (NPMPackage pkg, PackageJSON pkgJSON |
-        pkg.getAModule() = r.getTopLevel() and pkgJSON = pkg.getPackageJSON() |
-        not pkgJSON.declaresDependency(mod, _) and
-        not pkgJSON.getPeerDependencies().getADependency(mod, _) and
-        // exclude packages depending on `fbjs`, which automatically pulls in many otherwise
-        // undeclared dependencies
-        not pkgJSON.declaresDependency("fbjs", _)
-      )
+where
+  path = r.getImportedPath().getValue() and
+  // the imported module is the initial segment of the path, up to
+  // `/` or the end of the string, whichever comes first; we exclude
+  // local paths starting with `.` or `/`, since they might refer to files
+  // downloaded or generated during the build
+  mod = path.regexpCapture("([^./][^/]*)(/.*|$)", 1) and
+  // exclude WebPack/Require.js loaders
+  not mod.matches("%!%") and
+  // import cannot be resolved statically
+  not exists(r.getImportedModule()) and
+  // no enclosing NPM package declares a dependency on `mod`
+  forex(NPMPackage pkg, PackageJSON pkgJSON |
+    pkg.getAModule() = r.getTopLevel() and pkgJSON = pkg.getPackageJSON()
+  |
+    not pkgJSON.declaresDependency(mod, _) and
+    not pkgJSON.getPeerDependencies().getADependency(mod, _) and
+    // exclude packages depending on `fbjs`, which automatically pulls in many otherwise
+    // undeclared dependencies
+    not pkgJSON.declaresDependency("fbjs", _)
+  )
 select r, "Module " + mod + " cannot be resolved, and is not declared as a dependency in $@.",
-       getClosestPackageJSON(r.getFile().getParentContainer()), "package.json"
+  getClosestPackageJSON(r.getFile().getParentContainer()), "package.json"
diff --git a/javascript/ql/src/NodeJS/UnusedDependency.ql b/javascript/ql/src/NodeJS/UnusedDependency.ql
index 1349e6072737..e0b9daca7321 100644
--- a/javascript/ql/src/NodeJS/UnusedDependency.ql
+++ b/javascript/ql/src/NodeJS/UnusedDependency.ql
@@ -23,9 +23,7 @@ predicate declaresDependency(NPMPackage pkg, string name, JSONValue dep) {
 /**
  * Gets a path expression in a module belonging to `pkg`.
  */
-PathExpr getAPathExpr(NPMPackage pkg) {
-  result.getEnclosingModule() = pkg.getAModule()
-}
+PathExpr getAPathExpr(NPMPackage pkg) { result.getEnclosingModule() = pkg.getAModule() }
 
 /**
  * Gets a URL-valued attribute in a module or HTML file belonging to `pkg`.
@@ -39,14 +37,14 @@ DOM::AttributeDefinition getAURLAttribute(NPMPackage pkg) {
  * Gets the name of a script in the 'scripts' object of `pkg`.
  * The script makes use of a declared `dependency` of `pkg`.
  */
-string getPackageScriptNameWithDependency(NPMPackage pkg, string dependency){
-    exists (JSONObject scriptsObject, string scriptName, string script |
-        declaresDependency(pkg, dependency, _) and
-        scriptsObject = pkg.getPackageJSON().getPropValue("scripts") and
-        script = scriptsObject.getPropStringValue(scriptName) and
-        script.regexpMatch(".*\\b\\Q" + dependency + "\\E\\b.*") and
-        result = scriptName
-    )
+string getPackageScriptNameWithDependency(NPMPackage pkg, string dependency) {
+  exists(JSONObject scriptsObject, string scriptName, string script |
+    declaresDependency(pkg, dependency, _) and
+    scriptsObject = pkg.getPackageJSON().getPropValue("scripts") and
+    script = scriptsObject.getPropStringValue(scriptName) and
+    script.regexpMatch(".*\\b\\Q" + dependency + "\\E\\b.*") and
+    result = scriptName
+  )
 }
 
 /**
@@ -58,20 +56,21 @@ predicate usesDependency(NPMPackage pkg, string name) {
   (
     // there is a path expression (e.g., in a `require` or `import`) that
     // references `pkg`
-    exists (PathExpr path | path = getAPathExpr(pkg) |
+    exists(PathExpr path | path = getAPathExpr(pkg) |
       // check whether the path is `name` or starts with `name/`, ignoring a prefix that ends with '!' (example: "scriptloader!moment")
       path.getValue().regexpMatch("(.*!)?\\Q" + name + "\\E(/.*)?")
     )
     or
     // there is an HTML URL attribute that may reference `pkg`
-    exists (DOM::AttributeDefinition attr | attr = getAURLAttribute(pkg) |
+    exists(DOM::AttributeDefinition attr | attr = getAURLAttribute(pkg) |
       // check whether the URL contains `node_modules/name`
       attr.getStringValue().regexpMatch(".*\\bnode_modules/\\Q" + name + "\\E(/.*)?")
     )
     or
     // there is a reference in a package.json white-listed script
-    exists (string packageScriptName |
-      packageScriptName = getPackageScriptNameWithDependency(pkg, name) |
+    exists(string packageScriptName |
+      packageScriptName = getPackageScriptNameWithDependency(pkg, name)
+    |
       packageScriptName = "preinstall" or
       packageScriptName = "install" or
       packageScriptName = "postinstall"
@@ -88,23 +87,22 @@ predicate usesDependency(NPMPackage pkg, string name) {
  */
 predicate implicitRequire(NPMPackage pkg, string name) {
   // look for Express `set('view engine', ...)` calls
-  exists (MethodCallExpr setViewEngine, string engine |
+  exists(MethodCallExpr setViewEngine, string engine |
     Express::appCreation().flowsToExpr(setViewEngine.getReceiver()) and
     setViewEngine.getMethodName() = "set" and
     setViewEngine.getArgument(0).getStringValue() = "view engine" and
     setViewEngine.getArgument(1).getStringValue() = engine and
-    setViewEngine.getTopLevel() = pkg.getAModule() |
+    setViewEngine.getTopLevel() = pkg.getAModule()
+  |
     // chop off leading dot, if any
-    if engine.matches(".%") then
-      name = engine.suffix(1)
-    else
-      name = engine
+    if engine.matches(".%") then name = engine.suffix(1) else name = engine
   )
 }
 
 from NPMPackage pkg, string name, JSONValue dep
-where exists (pkg.getAModule()) and
-      declaresDependency(pkg, name, dep) and
-      not usesDependency(pkg, name) and
-      not implicitRequire(pkg, name)
+where
+  exists(pkg.getAModule()) and
+  declaresDependency(pkg, name, dep) and
+  not usesDependency(pkg, name) and
+  not implicitRequire(pkg, name)
 select dep, "Unused dependency '" + name + "'."
diff --git a/javascript/ql/src/Performance/NonLocalForIn.ql b/javascript/ql/src/Performance/NonLocalForIn.ql
index 88a9884d4b9d..ffbf5814f3c1 100644
--- a/javascript/ql/src/Performance/NonLocalForIn.ql
+++ b/javascript/ql/src/Performance/NonLocalForIn.ql
@@ -21,16 +21,19 @@ predicate nonLocalIterator(EnhancedForLoop f, string descr) {
   f.getIterator() instanceof PropAccess and descr = "a property"
   or
   // iterator is not a purely local variable:
-  exists (Variable v | v = f.getAnIterationVariable() |
+  exists(Variable v | v = f.getAnIterationVariable() |
     // either it is global...
-    v.isGlobal() and descr = "a global variable" or
+    v.isGlobal() and descr = "a global variable"
+    or
     // ...or it is captured by an inner function
     v.isLocal() and v.isCaptured() and descr = "captured"
   )
 }
 
 from EnhancedForLoop f, string reason
-where nonLocalIterator(f, reason) and
-      // exclude toplevel statements, since the toplevel is unlikely to be optimized anyway
-      not f.getContainer() instanceof TopLevel
-select f.getIterator(), "This loop may prevent optimization because its iteration variable is " + reason + "."
\ No newline at end of file
+where
+  nonLocalIterator(f, reason) and
+  // exclude toplevel statements, since the toplevel is unlikely to be optimized anyway
+  not f.getContainer() instanceof TopLevel
+select f.getIterator(),
+  "This loop may prevent optimization because its iteration variable is " + reason + "."
diff --git a/javascript/ql/src/Performance/ReDoS.ql b/javascript/ql/src/Performance/ReDoS.ql
index f92874138f87..4bdf265ab70c 100644
--- a/javascript/ql/src/Performance/ReDoS.ql
+++ b/javascript/ql/src/Performance/ReDoS.ql
@@ -83,14 +83,17 @@ import javascript
  * A branch in a disjunction that is the root node in a literal, or a literal
  * whose root node is not a disjunction.
  */
-class RegExpRoot extends @regexpterm { // RegExpTerm is abstract, so do not extend it.
+class RegExpRoot extends @regexpterm {
+  // RegExpTerm is abstract, so do not extend it.
   RegExpRoot() {
-    exists (RegExpLiteral literal, RegExpAlt alt | alt.getParent() = literal |
-      this = alt.getAChild())
+    exists(RegExpLiteral literal, RegExpAlt alt | alt.getParent() = literal |
+      this = alt.getAChild()
+    )
     or
-    exists (RegExpLiteral literal |
-      not exists (RegExpAlt alt | alt.getParent() = literal) and
-      this.(RegExpTerm).getParent() = literal)
+    exists(RegExpLiteral literal |
+      not exists(RegExpAlt alt | alt.getParent() = literal) and
+      this.(RegExpTerm).getParent() = literal
+    )
   }
 
   /**
@@ -98,10 +101,9 @@ class RegExpRoot extends @regexpterm { // RegExpTerm is abstract, so do not exte
    */
   predicate isRelevant() {
     // there is at least one repetition
-    exists (RegExpRepetition rep | getRoot(rep) = this)
-    and
+    exists(RegExpRepetition rep | getRoot(rep) = this) and
     // there are no lookbehinds
-    not exists (RegExpLookbehind lbh | getRoot(lbh) = this)
+    not exists(RegExpLookbehind lbh | getRoot(lbh) = this)
   }
 
   string toString() { result = this.(RegExpTerm).toString() }
@@ -132,8 +134,7 @@ RegExpRoot getRoot(RegExpTerm term) {
  */
 newtype TInputSymbol =
   /** An input symbol corresponding to character `c`. */
-  Char(string c) { c = any(RegExpConstant cc).getValue() }
-  or
+  Char(string c) { c = any(RegExpConstant cc).getValue() } or
   /**
    * An input symbol representing all characters matched by
    * (positive, non-universal) character class `recc`.
@@ -142,18 +143,14 @@ newtype TInputSymbol =
     getRoot(recc).isRelevant() and
     not recc.isInverted() and
     not isUniversalClass(recc)
-  }
-  or
+  } or
   /** An input symbol representing all characters matched by `.`. */
-  Dot()
-  or
+  Dot() or
   /** An input symbol representing all characters. */
-  Any()
-  or
+  Any() or
   /** An epsilon transition in the automaton. */
   Epsilon()
 
-
 /**
  * Holds if character class `cc` matches all characters.
  */
@@ -163,9 +160,10 @@ predicate isUniversalClass(RegExpCharacterClass cc) {
   or
   // [\w\W] and similar
   not cc.isInverted() and
-  exists (string cce1, string cce2 |
+  exists(string cce1, string cce2 |
     cce1 = cc.getAChild().(RegExpCharacterClassEscape).getValue() and
-    cce2 = cc.getAChild().(RegExpCharacterClassEscape).getValue() |
+    cce2 = cc.getAChild().(RegExpCharacterClassEscape).getValue()
+  |
     cce1 != cce2 and cce1.toLowerCase() = cce2.toLowerCase()
   )
 }
@@ -174,14 +172,15 @@ predicate isUniversalClass(RegExpCharacterClass cc) {
  * An abstract input symbol, representing a set of concrete characters.
  */
 class InputSymbol extends TInputSymbol {
-  InputSymbol() {
-    not this instanceof Epsilon
-  }
+  InputSymbol() { not this instanceof Epsilon }
 
   string toString() {
-    this = Char(result) or
-    result = any(RegExpCharacterClass recc | this = CharClass(recc)).toString() or
-    this = Dot() and result = "." or
+    this = Char(result)
+    or
+    result = any(RegExpCharacterClass recc | this = CharClass(recc)).toString()
+    or
+    this = Dot() and result = "."
+    or
     this = Any() and result = "[^]"
   }
 }
@@ -192,20 +191,26 @@ class InputSymbol extends TInputSymbol {
 string getCCLowerBound(RegExpTerm t) {
   t.getParent() instanceof RegExpCharacterClass and
   (
-    result = t.(RegExpConstant).getValue() or
-    t.(RegExpCharacterRange).isRange(result, _) or
-    exists (string name | name = t.(RegExpCharacterClassEscape).getValue() |
-      name = "w" and result = "0" or
-      name = "W" and result = "" or
-      name = "s" and result = "" or
-      name = "S" and result = "")
+    result = t.(RegExpConstant).getValue()
+    or
+    t.(RegExpCharacterRange).isRange(result, _)
+    or
+    exists(string name | name = t.(RegExpCharacterClassEscape).getValue() |
+      name = "w" and result = "0"
+      or
+      name = "W" and result = ""
+      or
+      name = "s" and result = ""
+      or
+      name = "S" and result = ""
+    )
   )
 }
 
 /**
  * The highest character used in a regular expression. Used to represent intervals without an upper bound.
  */
-string highestCharacter() { result = max(RegExpConstant c || c.getValue()) }
+string highestCharacter() { result = max(RegExpConstant c | | c.getValue()) }
 
 /**
  * Gets an upper bound on the characters matched by the given character class term.
@@ -213,13 +218,19 @@ string highestCharacter() { result = max(RegExpConstant c || c.getValue()) }
 string getCCUpperBound(RegExpTerm t) {
   t.getParent() instanceof RegExpCharacterClass and
   (
-    result = t.(RegExpConstant).getValue() or
-    t.(RegExpCharacterRange).isRange(_, result) or
-    exists (string name | name = t.(RegExpCharacterClassEscape).getValue() |
-      name = "w" and result = "z" or
-      name = "W" and result = highestCharacter() or
-      name = "s" and result = highestCharacter() or
-      name = "S" and result = highestCharacter())
+    result = t.(RegExpConstant).getValue()
+    or
+    t.(RegExpCharacterRange).isRange(_, result)
+    or
+    exists(string name | name = t.(RegExpCharacterClassEscape).getValue() |
+      name = "w" and result = "z"
+      or
+      name = "W" and result = highestCharacter()
+      or
+      name = "s" and result = highestCharacter()
+      or
+      name = "S" and result = highestCharacter()
+    )
   )
 }
 
@@ -228,10 +239,11 @@ string getCCUpperBound(RegExpTerm t) {
  * in the interval `lo-hi`.
  */
 predicate hasBounds(RegExpRoot l, InputSymbol s, string lo, string hi) {
-  exists (RegExpCharacterClass cc | s = CharClass(cc) |
+  exists(RegExpCharacterClass cc | s = CharClass(cc) |
     l = getRoot(cc) and
     lo = min(getCCLowerBound(cc.getAChild())) and
-    hi = max(getCCUpperBound(cc.getAChild())))
+    hi = max(getCCUpperBound(cc.getAChild()))
+  )
 }
 
 /**
@@ -240,21 +252,18 @@ predicate hasBounds(RegExpRoot l, InputSymbol s, string lo, string hi) {
  * This predicate is over-approximate; it is only used for pruning the search space.
  */
 predicate compatible(InputSymbol s1, InputSymbol s2) {
-  exists (RegExpRoot l, string lo1, string lo2, string hi1, string hi2 |
-    hasBounds(l, s1, lo1, hi1) and hasBounds(l, s2, lo2, hi2) and
-    max(string s | s = lo1 or s = lo2) <= min(string s | s = hi1 or s = hi2))
+  exists(RegExpRoot l, string lo1, string lo2, string hi1, string hi2 |
+    hasBounds(l, s1, lo1, hi1) and
+    hasBounds(l, s2, lo2, hi2) and
+    max(string s | s = lo1 or s = lo2) <= min(string s | s = hi1 or s = hi2)
+  )
   or
-  exists (intersect(s1, s2))
+  exists(intersect(s1, s2))
 }
 
 newtype TState =
-  Match(RegExpTerm t) {
-    getRoot(t).isRelevant()
-  }
-  or
-  Accept(RegExpRoot l) {
-    l.isRelevant()
-  }
+  Match(RegExpTerm t) { getRoot(t).isRelevant() } or
+  Accept(RegExpRoot l) { l.isRelevant() }
 
 /**
  * A state in the NFA corresponding to a regular expression.
@@ -267,24 +276,21 @@ newtype TState =
 class State extends TState {
   RegExpParent repr;
 
-  State() {
-    this = Match(repr) or this = Accept(repr)
-  }
+  State() { this = Match(repr) or this = Accept(repr) }
 
   string toString() {
-    result = "Match(" + (RegExpTerm)repr + ")" or
-    result = "Accept(" + (RegExpRoot)repr + ")"
+    result = "Match(" + repr.(RegExpTerm) + ")" or
+    result = "Accept(" + repr.(RegExpRoot) + ")"
   }
 
-  Location getLocation() {
-    result = repr.getLocation()
-  }
+  Location getLocation() { result = repr.getLocation() }
 }
 
 class EdgeLabel extends TInputSymbol {
   string toString() {
-    this = Epsilon() and result = "" or
-    exists (InputSymbol s | this = s and result = s.toString())
+    this = Epsilon() and result = ""
+    or
+    exists(InputSymbol s | this = s and result = s.toString())
   }
 }
 
@@ -292,78 +298,63 @@ class EdgeLabel extends TInputSymbol {
  * Gets a state the NFA may be in after matching `t`.
  */
 State after(RegExpTerm t) {
-  exists (RegExpAlt alt | t = alt.getAChild() |
-    result = after(alt)
-  )
+  exists(RegExpAlt alt | t = alt.getAChild() | result = after(alt))
   or
-  exists (RegExpSequence seq, int i | t = seq.getChild(i) |
-    result = Match(seq.getChild(i+1)) or
-    i+1 = seq.getNumChild() and result = after(seq)
+  exists(RegExpSequence seq, int i | t = seq.getChild(i) |
+    result = Match(seq.getChild(i + 1))
+    or
+    i + 1 = seq.getNumChild() and result = after(seq)
   )
   or
-  exists (RegExpGroup grp | t = grp.getAChild() |
-    result = after(grp)
-  )
+  exists(RegExpGroup grp | t = grp.getAChild() | result = after(grp))
   or
-  exists (RegExpStar star | t = star.getAChild() |
-    result = Match(star)
-  )
+  exists(RegExpStar star | t = star.getAChild() | result = Match(star))
   or
-  exists (RegExpPlus plus | t = plus.getAChild() |
+  exists(RegExpPlus plus | t = plus.getAChild() |
     result = Match(plus) or
     result = after(plus)
   )
   or
-  exists (RegExpOpt opt | t = opt.getAChild() |
-    result = after(opt)
-  )
+  exists(RegExpOpt opt | t = opt.getAChild() | result = after(opt))
   or
-  exists (RegExpRoot root | t = root |
-    result = Accept(root)
-  )
+  exists(RegExpRoot root | t = root | result = Accept(root))
 }
 
 /**
  * Holds if the NFA has a transition from `q1` to `q2` labelled with `lbl`.
  */
 predicate delta(State q1, EdgeLabel lbl, State q2) {
-  exists (RegExpConstant s |
-    q1 = Match(s) and lbl = Char(s.getValue()) and q2 = after(s)
-  )
+  exists(RegExpConstant s | q1 = Match(s) and lbl = Char(s.getValue()) and q2 = after(s))
   or
-  exists (RegExpDot dot, RegExpLiteral rel |
-    q1 = Match(dot) and q2 = after(dot) and rel = dot.getLiteral() |
+  exists(RegExpDot dot, RegExpLiteral rel |
+    q1 = Match(dot) and q2 = after(dot) and rel = dot.getLiteral()
+  |
     if rel.isDotAll() then lbl = Any() else lbl = Dot()
   )
   or
-  exists (RegExpCharacterClass cc |
-    isUniversalClass(cc) and q1 = Match(cc) and lbl = Any() and q2 = after(cc) or
+  exists(RegExpCharacterClass cc |
+    isUniversalClass(cc) and q1 = Match(cc) and lbl = Any() and q2 = after(cc)
+    or
     q1 = Match(cc) and lbl = CharClass(cc) and q2 = after(cc)
   )
   or
-  exists (RegExpAlt alt | lbl = Epsilon() |
-    q1 = Match(alt) and q2 = Match(alt.getAChild())
-  )
+  exists(RegExpAlt alt | lbl = Epsilon() | q1 = Match(alt) and q2 = Match(alt.getAChild()))
   or
-  exists (RegExpSequence seq | lbl = Epsilon() |
-    q1 = Match(seq) and q2 = Match(seq.getChild(0))
-  )
+  exists(RegExpSequence seq | lbl = Epsilon() | q1 = Match(seq) and q2 = Match(seq.getChild(0)))
   or
-  exists (RegExpGroup grp | lbl = Epsilon() |
-    q1 = Match(grp) and q2 = Match(grp.getChild(0))
-  )
+  exists(RegExpGroup grp | lbl = Epsilon() | q1 = Match(grp) and q2 = Match(grp.getChild(0)))
   or
-  exists (RegExpStar star | lbl = Epsilon() |
-    q1 = Match(star) and q2 = Match(star.getChild(0)) or
+  exists(RegExpStar star | lbl = Epsilon() |
+    q1 = Match(star) and q2 = Match(star.getChild(0))
+    or
     q1 = Match(star) and q2 = after(star)
   )
   or
-  exists (RegExpPlus plus | lbl = Epsilon() |
-    q1 = Match(plus) and q2 = Match(plus.getChild(0))
-  )
+  exists(RegExpPlus plus | lbl = Epsilon() | q1 = Match(plus) and q2 = Match(plus.getChild(0)))
   or
-  exists (RegExpOpt opt | lbl = Epsilon() |
-    q1 = Match(opt) and q2 = Match(opt.getChild(0)) or
+  exists(RegExpOpt opt | lbl = Epsilon() |
+    q1 = Match(opt) and q2 = Match(opt.getChild(0))
+    or
     q1 = Match(opt) and q2 = after(opt)
   )
 }
@@ -371,26 +362,19 @@ predicate delta(State q1, EdgeLabel lbl, State q2) {
 /**
  * Gets a state that `q` has an epsilon transition to.
  */
-State epsilonSucc(State q) {
-  delta(q, Epsilon(), result)
-}
+State epsilonSucc(State q) { delta(q, Epsilon(), result) }
 
 /**
  * Gets a state that has an epsilon transition to `q`.
  */
-State epsilonPred(State q) {
-  q = epsilonSucc(result)
-}
+State epsilonPred(State q) { q = epsilonSucc(result) }
 
 /**
  * Holds if there is a state `q` that can be reached from `q1`
  * along epsilon edges, such that there is a transition from
  * `q` to `q2` that consumes symbol `s`.
  */
-predicate deltaClosed(State q1, InputSymbol s, State q2) {
-  delta(epsilonSucc*(q1), s, q2)
-}
-
+predicate deltaClosed(State q1, InputSymbol s, State q2) { delta(epsilonSucc*(q1), s, q2) }
 
 /**
  * A state in the product automaton.
@@ -411,6 +395,7 @@ newtype TStatePair =
 
 class StatePair extends TStatePair {
   State q1;
+
   State q2;
 
   StatePair() { this = MkStatePair(q1, q2) }
@@ -448,15 +433,20 @@ int statePairDist(StatePair q, StatePair r) =
  */
 pragma[noopt]
 predicate isFork(State q, InputSymbol s1, InputSymbol s2, State r1, State r2) {
-  exists (State q1, State q2 |
-    q1 = epsilonSucc*(q) and delta(q1, s1, r1) and
-    q2 = epsilonSucc*(q) and delta(q2, s2, r2) and
+  exists(State q1, State q2 |
+    q1 = epsilonSucc*(q) and
+    delta(q1, s1, r1) and
+    q2 = epsilonSucc*(q) and
+    delta(q2, s2, r2) and
     // Use pragma[noopt] to prevent compatible(s1,s2) from being the starting point of the join.
     // From (s1,s2) it would find a huge number of intermediate state pairs (q1,q2) originating from different literals,
     // and discover at the end that no `q` can reach both `q1` and `q2` by epsilon transitions.
-    compatible(s1, s2) |
-    s1 != s2 or
-    r1 != r2 or
+    compatible(s1, s2)
+  |
+    s1 != s2
+    or
+    r1 != r2
+    or
     r1 = r2 and q1 != q2
   )
 }
@@ -466,9 +456,7 @@ predicate isFork(State q, InputSymbol s1, InputSymbol s2, State r1, State r2) {
  * components of `r` labelled with `s1` and `s2`, respectively.
  */
 predicate step(StatePair q, InputSymbol s1, InputSymbol s2, StatePair r) {
-  exists (State r1, State r2 |
-    step(q, s1, s2, r1, r2) and r = mkStatePair(r1, r2)
-  )
+  exists(State r1, State r2 | step(q, s1, s2, r1, r2) and r = mkStatePair(r1, r2))
 }
 
 /**
@@ -476,8 +464,9 @@ predicate step(StatePair q, InputSymbol s1, InputSymbol s2, StatePair r) {
  * labelled with `s1` and `s2`, respectively.
  */
 predicate step(StatePair q, InputSymbol s1, InputSymbol s2, State r1, State r2) {
-  exists (State q1, State q2 | q = MkStatePair(q1, q2) |
-    deltaClosed(q1, s1, r1) and deltaClosed(q2, s2, r2) and
+  exists(State q1, State q2 | q = MkStatePair(q1, q2) |
+    deltaClosed(q1, s1, r1) and
+    deltaClosed(q2, s2, r2) and
     compatible(s1, s2)
   )
 }
@@ -489,10 +478,11 @@ predicate step(StatePair q, InputSymbol s1, InputSymbol s2, State r1, State r2)
 newtype Trace =
   Nil() or
   Step(InputSymbol s1, InputSymbol s2, Trace t) {
-    exists (StatePair p |
+    exists(StatePair p |
       isReachableFromFork(_, p, t, _) and
       step(p, s1, s2, _)
-    ) or
+    )
+    or
     t = Nil() and isFork(_, s1, s2, _, _)
   }
 
@@ -500,28 +490,42 @@ newtype Trace =
  * Gets a character that is represented by both `c` and `d`.
  */
 string intersect(InputSymbol c, InputSymbol d) {
-  c = Char(result) and (
-    d = Char(result) or
-    exists (RegExpCharacterClass cc | d = CharClass(cc) |
-      exists (RegExpTerm child | child = cc.getAChild() |
-        result = child.(RegExpConstant).getValue() or
-        exists (string lo, string hi | child.(RegExpCharacterRange).isRange(lo, hi) |
+  c = Char(result) and
+  (
+    d = Char(result)
+    or
+    exists(RegExpCharacterClass cc | d = CharClass(cc) |
+      exists(RegExpTerm child | child = cc.getAChild() |
+        result = child.(RegExpConstant).getValue()
+        or
+        exists(string lo, string hi | child.(RegExpCharacterRange).isRange(lo, hi) |
           lo <= result and result <= hi
         )
       )
-    ) or
-    d = Dot() and not (result = "\n" or result = "\r") or
+    )
+    or
+    d = Dot() and
+    not (result = "\n" or result = "\r")
+    or
     d = Any()
-  ) or
-  exists (RegExpCharacterClass cc | c = CharClass(cc) and result = choose(cc) |
-    d = CharClass(cc) or
-    d = Dot() and not (result = "\n" or result = "\r") or
+  )
+  or
+  exists(RegExpCharacterClass cc | c = CharClass(cc) and result = choose(cc) |
+    d = CharClass(cc)
+    or
+    d = Dot() and
+    not (result = "\n" or result = "\r")
+    or
     d = Any()
-  ) or
-  c = Dot() and (
-    d = Dot() and result = "a" or
+  )
+  or
+  c = Dot() and
+  (
+    d = Dot() and result = "a"
+    or
     d = Any() and result = "a"
-  ) or
+  )
+  or
   c = Any() and d = Any() and result = "a"
   or
   result = intersect(d, c)
@@ -532,11 +536,11 @@ string intersect(InputSymbol c, InputSymbol d) {
  */
 string choose(RegExpCharacterClass cc) {
   result = min(string c |
-    exists (RegExpTerm child | child = cc.getAChild() |
-      c = child.(RegExpConstant).getValue() or
-      child.(RegExpCharacterRange).isRange(c, _)
+      exists(RegExpTerm child | child = cc.getAChild() |
+        c = child.(RegExpConstant).getValue() or
+        child.(RegExpCharacterRange).isRange(c, _)
+      )
     )
-  )
 }
 
 /**
@@ -545,7 +549,7 @@ string choose(RegExpCharacterClass cc) {
 string concretise(Trace t) {
   t = Nil() and result = ""
   or
-  exists (InputSymbol s1, InputSymbol s2, Trace rest | t = Step(s1, s2, rest) |
+  exists(InputSymbol s1, InputSymbol s2, Trace rest | t = Step(s1, s2, rest) |
     result = concretise(rest) + intersect(s1, s2)
   )
 }
@@ -555,15 +559,15 @@ string concretise(Trace t) {
  * a path from `r` back to `(fork, fork)` with `rem` steps.
  */
 predicate isReachableFromFork(State fork, StatePair r, Trace w, int rem) {
-  exists (InputSymbol s1, InputSymbol s2, State q1, State q2 |
+  exists(InputSymbol s1, InputSymbol s2, State q1, State q2 |
     isFork(fork, s1, s2, q1, q2) and
     r = MkStatePair(q1, q2) and
     w = Step(s1, s2, Nil()) and
     rem = statePairDist(r, MkStatePair(fork, fork))
   )
   or
-  exists (StatePair p, Trace v, InputSymbol s1, InputSymbol s2 |
-    isReachableFromFork(fork, p, v, rem+1) and
+  exists(StatePair p, Trace v, InputSymbol s1, InputSymbol s2 |
+    isReachableFromFork(fork, p, v, rem + 1) and
     step(p, s1, s2, r) and
     w = Step(s1, s2, v) and
     rem > 0
@@ -583,12 +587,12 @@ StatePair getAForkPair(State fork) {
  * Holds if `fork` is a pumpable fork with word `w`.
  */
 predicate isPumpable(State fork, string w) {
-  exists (StatePair q, Trace t |
+  exists(StatePair q, Trace t |
     isReachableFromFork(fork, q, t, _) and
     (
       q = getAForkPair(fork) and w = concretise(t)
       or
-      exists (InputSymbol s1, InputSymbol s2 |
+      exists(InputSymbol s1, InputSymbol s2 |
         step(q, s1, s2, getAForkPair(fork)) and
         w = concretise(Step(s1, s2, t))
       )
@@ -608,8 +612,12 @@ predicate isPumpable(State fork, string w) {
  */
 State process(State fork, string w, int i) {
   isPumpable(fork, w) and
-  exists (State prev | i = 0 and prev = fork or prev = process(fork, w, i-1) |
-    exists (InputSymbol s |
+  exists(State prev |
+    i = 0 and prev = fork
+    or
+    prev = process(fork, w, i - 1)
+  |
+    exists(InputSymbol s |
       deltaClosed(prev, s, result) and
       exists(intersect(Char(w.charAt(i)), s))
     )
@@ -626,7 +634,10 @@ string escape(string s) {
 }
 
 from RegExpTerm t, string c
-where c = min(string w | isPumpable(Match(t), w)) and not isPumpable(epsilonSucc+(Match(t)), _) and
-      not epsilonSucc*(process(Match(t), c, c.length()-1)) = Accept(_)
-select t, "This part of the regular expression may cause exponential backtracking on strings " +
-          "containing many repetitions of '" + escape(c) + "'."
+where
+  c = min(string w | isPumpable(Match(t), w)) and
+  not isPumpable(epsilonSucc+(Match(t)), _) and
+  not epsilonSucc*(process(Match(t), c, c.length() - 1)) = Accept(_)
+select t,
+  "This part of the regular expression may cause exponential backtracking on strings " +
+    "containing many repetitions of '" + escape(c) + "'."
diff --git a/javascript/ql/src/Performance/ReassignParameterAndUseArguments.ql b/javascript/ql/src/Performance/ReassignParameterAndUseArguments.ql
index 0890336e52ec..f6dafcdd95a9 100644
--- a/javascript/ql/src/Performance/ReassignParameterAndUseArguments.ql
+++ b/javascript/ql/src/Performance/ReassignParameterAndUseArguments.ql
@@ -13,10 +13,12 @@
 import javascript
 
 from Function f, SimpleParameter p, VarAccess assgn
-where p = f.getAParameter() and
-      f.usesArgumentsObject() and
-      assgn = p.getVariable().getAnAccess() and
-      assgn.isLValue()
-select p, "This parameter is reassigned $@, " +
-          "which may prevent optimization because the surrounding function " +
-          "uses the arguments object.", assgn, "here"
\ No newline at end of file
+where
+  p = f.getAParameter() and
+  f.usesArgumentsObject() and
+  assgn = p.getVariable().getAnAccess() and
+  assgn.isLValue()
+select p,
+  "This parameter is reassigned $@, " +
+    "which may prevent optimization because the surrounding function " +
+    "uses the arguments object.", assgn, "here"
diff --git a/javascript/ql/src/React/DirectStateMutation.ql b/javascript/ql/src/React/DirectStateMutation.ql
index ee424635c7d9..6e3d63a52148 100644
--- a/javascript/ql/src/React/DirectStateMutation.ql
+++ b/javascript/ql/src/React/DirectStateMutation.ql
@@ -13,7 +13,8 @@
 import semmle.javascript.frameworks.React
 
 from DataFlow::PropWrite pwn, ReactComponent c
-where pwn.getBase() = c.getAStateAccess() and
-      // writes in constructors are ok
-      not pwn.getContainer() instanceof Constructor
+where
+  pwn.getBase() = c.getAStateAccess() and
+  // writes in constructors are ok
+  not pwn.getContainer() instanceof Constructor
 select pwn, "Use `setState` instead of directly modifying component state."
diff --git a/javascript/ql/src/React/InconsistentStateUpdate.ql b/javascript/ql/src/React/InconsistentStateUpdate.ql
index 7ad78c87d9e5..31625b2187af 100644
--- a/javascript/ql/src/React/InconsistentStateUpdate.ql
+++ b/javascript/ql/src/React/InconsistentStateUpdate.ql
@@ -27,18 +27,15 @@ DataFlow::PropRead getAnUnsafeAccess(ReactComponent c) {
  * access.
  */
 DataFlow::PropRead getAnOutermostUnsafeAccess(ReactComponent c) {
-  result = getAnUnsafeAccess(c)
-  and
-  not exists (DataFlow::PropRead outer | outer = getAnUnsafeAccess(c) |
-    result = outer.getBase()
-  )
+  result = getAnUnsafeAccess(c) and
+  not exists(DataFlow::PropRead outer | outer = getAnUnsafeAccess(c) | result = outer.getBase())
 }
 
 /**
  * Gets a property write through `setState` for state property `name` of `c`.
  */
 DataFlow::PropWrite getAStateUpdate(ReactComponent c, string name) {
-  exists (DataFlow::ObjectLiteralNode newState |
+  exists(DataFlow::ObjectLiteralNode newState |
     newState.flowsTo(c.getAMethodCall("setState").getArgument(0)) and
     result = newState.getAPropertyWrite(name)
   )
@@ -48,7 +45,7 @@ DataFlow::PropWrite getAStateUpdate(ReactComponent c, string name) {
  * Gets a property write through `setState` for a state property of `c` that is only written at this property write.
  */
 DataFlow::PropWrite getAUniqueStateUpdate(ReactComponent c) {
-  exists (string name |
+  exists(string name |
     count(getAStateUpdate(c, name)) = 1 and
     result = getAStateUpdate(c, name)
   )
@@ -58,7 +55,7 @@ DataFlow::PropWrite getAUniqueStateUpdate(ReactComponent c) {
  * Holds for "self dependent" component state updates. E.g. `this.setState({toggled: !this.state.toggled})`.
  */
 predicate isAStateUpdateFromSelf(ReactComponent c, DataFlow::PropWrite pwn, DataFlow::PropRead prn) {
-  exists (string name |
+  exists(string name |
     pwn = getAStateUpdate(c, name) and
     c.getADirectStateAccess().flowsTo(prn.getBase()) and
     prn.getPropertyName() = name and
@@ -68,13 +65,14 @@ predicate isAStateUpdateFromSelf(ReactComponent c, DataFlow::PropWrite pwn, Data
 }
 
 from ReactComponent c, MethodCallExpr setState, Expr getState
-where setState = c.getAMethodCall("setState").asExpr() and
-      getState = getAnOutermostUnsafeAccess(c).asExpr() and
-      getState.getParentExpr*() = setState.getArgument(0) and
-      getState.getEnclosingFunction() = setState.getEnclosingFunction() and
-      // ignore self-updates that only occur in one location: `setState({toggled: !this.state.toggled})`, they are most likely safe in practice
-      not exists (DataFlow::PropWrite pwn |
-        pwn = getAUniqueStateUpdate(c) and
-        isAStateUpdateFromSelf(c, pwn, DataFlow::valueNode(getState))
-      )
-select setState, "Component state update uses $@.", getState, "potentially inconsistent value"
\ No newline at end of file
+where
+  setState = c.getAMethodCall("setState").asExpr() and
+  getState = getAnOutermostUnsafeAccess(c).asExpr() and
+  getState.getParentExpr*() = setState.getArgument(0) and
+  getState.getEnclosingFunction() = setState.getEnclosingFunction() and
+  // ignore self-updates that only occur in one location: `setState({toggled: !this.state.toggled})`, they are most likely safe in practice
+  not exists(DataFlow::PropWrite pwn |
+    pwn = getAUniqueStateUpdate(c) and
+    isAStateUpdateFromSelf(c, pwn, DataFlow::valueNode(getState))
+  )
+select setState, "Component state update uses $@.", getState, "potentially inconsistent value"
diff --git a/javascript/ql/src/React/UnsupportedStateUpdateInLifecycleMethod.ql b/javascript/ql/src/React/UnsupportedStateUpdateInLifecycleMethod.ql
index bffe9e0b2e7b..d1798ee51e8e 100644
--- a/javascript/ql/src/React/UnsupportedStateUpdateInLifecycleMethod.ql
+++ b/javascript/ql/src/React/UnsupportedStateUpdateInLifecycleMethod.ql
@@ -15,11 +15,9 @@ import javascript
  * A call that invokes a method on its own receiver.
  */
 class CallOnSelf extends DataFlow::CallNode {
-
   CallOnSelf() {
-    exists (Function binder |
-      binder = getEnclosingFunction().getThisBinder() |
-      exists (DataFlow::ThisNode thiz |
+    exists(Function binder | binder = getEnclosingFunction().getThisBinder() |
+      exists(DataFlow::ThisNode thiz |
         this = thiz.getAMethodCall(_) and
         thiz.getBinder().getAstNode() = binder
       )
@@ -31,32 +29,25 @@ class CallOnSelf extends DataFlow::CallNode {
   /**
    * Gets a `CallOnSelf` in the callee of this call.
    */
-  CallOnSelf getACalleCallOnSelf() {
-    result.getEnclosingFunction() = this.getACallee()
-  }
-
+  CallOnSelf getACalleCallOnSelf() { result.getEnclosingFunction() = this.getACallee() }
 }
 
 /**
  * A call that is definitely invoked by the caller, unless an exception occurs.
  */
 class UnconditionalCallOnSelf extends CallOnSelf {
-
-  UnconditionalCallOnSelf() {
-    isUnconditionalCall(this)
-  }
+  UnconditionalCallOnSelf() { isUnconditionalCall(this) }
 
   override UnconditionalCallOnSelf getACalleCallOnSelf() {
     result = CallOnSelf.super.getACalleCallOnSelf()
   }
-
 }
 
 /**
  * Holds if `call` is guaranteed to occur in its enclosing function, unless an exception occurs.
  */
 predicate isUnconditionalCall(DataFlow::CallNode call) {
-  exists (ReachableBasicBlock callBlock, ReachableBasicBlock entryBlock |
+  exists(ReachableBasicBlock callBlock, ReachableBasicBlock entryBlock |
     callBlock.postDominates(entryBlock) and
     callBlock = call.getBasicBlock() and
     entryBlock = call.getEnclosingFunction().getEntryBB()
@@ -64,10 +55,11 @@ predicate isUnconditionalCall(DataFlow::CallNode call) {
 }
 
 predicate isStateUpdateMethodCall(DataFlow::MethodCallNode mce) {
-  exists (string updateMethodName |
+  exists(string updateMethodName |
     updateMethodName = "setState" or
     updateMethodName = "replaceState" or
-    updateMethodName = "forceUpdate" |
+    updateMethodName = "forceUpdate"
+  |
     mce.getMethodName() = updateMethodName
   )
 }
@@ -76,7 +68,6 @@ predicate isStateUpdateMethodCall(DataFlow::MethodCallNode mce) {
  * A React component method in which state updates may have surprising effects.
  */
 class StateUpdateVolatileMethod extends Function {
-
   string methodName;
 
   StateUpdateVolatileMethod() {
@@ -84,15 +75,15 @@ class StateUpdateVolatileMethod extends Function {
     // - componentWillUnmount
     // - componentsWillMount
     // - componentsDidMount
-
-    exists (ReactComponent c |
+    exists(ReactComponent c |
       methodName = "componentDidUnmount" or
       methodName = "componentDidUpdate" or
       methodName = "componentWillUpdate" or
       methodName = "getDefaultProps" or
       methodName = "getInitialState" or
       methodName = "render" or
-      methodName = "shouldComponentUpdate" |
+      methodName = "shouldComponentUpdate"
+    |
       this = c.getInstanceMethod(methodName)
     )
     or
@@ -104,21 +95,24 @@ class StateUpdateVolatileMethod extends Function {
    * Holds if conditional state updates are benign in this method.
    */
   predicate conditionalStateUpatesAreBenign() {
-      methodName = "componentDidUpdate" or
-      methodName = "componentWillUpdate" or
-      methodName = "shouldComponentUpdate"
+    methodName = "componentDidUpdate" or
+    methodName = "componentWillUpdate" or
+    methodName = "shouldComponentUpdate"
   }
-
 }
 
-from StateUpdateVolatileMethod root, CallOnSelf initCall, DataFlow::MethodCallNode stateUpdate,
-     string callDescription
-where initCall.getEnclosingFunction() = root and
-      stateUpdate = initCall.getACalleCallOnSelf*() and
-      isStateUpdateMethodCall(stateUpdate) and
-      if root.conditionalStateUpatesAreBenign() then
-        initCall instanceof UnconditionalCallOnSelf and
-        callDescription = "Unconditional call"
-      else
-        callDescription = "Call"
-select initCall, callDescription + " to state update method $@ is not allowed from within this method.", stateUpdate, " ." + stateUpdate.getMethodName()
+from
+  StateUpdateVolatileMethod root, CallOnSelf initCall, DataFlow::MethodCallNode stateUpdate,
+  string callDescription
+where
+  initCall.getEnclosingFunction() = root and
+  stateUpdate = initCall.getACalleCallOnSelf*() and
+  isStateUpdateMethodCall(stateUpdate) and
+  if root.conditionalStateUpatesAreBenign()
+  then
+    initCall instanceof UnconditionalCallOnSelf and
+    callDescription = "Unconditional call"
+  else callDescription = "Call"
+select initCall,
+  callDescription + " to state update method $@ is not allowed from within this method.",
+  stateUpdate, " ." + stateUpdate.getMethodName()
diff --git a/javascript/ql/src/React/UnusedOrUndefinedStateProperty.ql b/javascript/ql/src/React/UnusedOrUndefinedStateProperty.ql
index 629740fa35d5..721d6639ac7e 100644
--- a/javascript/ql/src/React/UnusedOrUndefinedStateProperty.ql
+++ b/javascript/ql/src/React/UnusedOrUndefinedStateProperty.ql
@@ -1,6 +1,6 @@
 /**
  * @name Unused or undefined state property
- * @description  Unused or undefined component state properties may be a symptom of a bug and should be examined carefully.
+ * @description Unused or undefined component state properties may be a symptom of a bug and should be examined carefully.
  * @kind problem
  * @problem.severity warning
  * @id js/react/unused-or-undefined-state-property
@@ -13,7 +13,6 @@
 import semmle.javascript.frameworks.React
 import semmle.javascript.RestrictedLocations
 
-
 /**
  * Gets the source of a future, present or past state object of `c`.
  */
@@ -34,7 +33,7 @@ DataFlow::PropRef getAPotentialStateAccess(ReactComponent c) {
  * Holds if the state object of `c` escapes from the scope of this file's query.
  */
 predicate hasAStateEscape(ReactComponent c) {
-  exists (DataFlow::InvokeNode invk |
+  exists(DataFlow::InvokeNode invk |
     not invk = c.getAMethodCall("setState") and
     potentialStateSource(c).flowsTo(invk.getAnArgument())
   )
@@ -44,11 +43,12 @@ predicate hasAStateEscape(ReactComponent c) {
  * Holds if there exists a write for a state property of `c` that uses an unknown property name.
  */
 predicate hasUnknownStatePropertyWrite(ReactComponent c) {
-  exists (DataFlow::PropWrite pwn |
+  exists(DataFlow::PropWrite pwn |
     pwn = getAPotentialStateAccess(c) and
-    not exists (pwn.getPropertyName())
-  ) or
-  exists (DataFlow::SourceNode source |
+    not exists(pwn.getPropertyName())
+  )
+  or
+  exists(DataFlow::SourceNode source |
     source = c.getACandidateStateSource() and
     not source instanceof DataFlow::ObjectLiteralNode
   )
@@ -58,13 +58,12 @@ predicate hasUnknownStatePropertyWrite(ReactComponent c) {
  * Holds if there exists a read for a state property of `c` that uses an unknown property name.
  */
 predicate hasUnknownStatePropertyRead(ReactComponent c) {
-  exists (DataFlow::PropRead prn |
+  exists(DataFlow::PropRead prn |
     prn = getAPotentialStateAccess(c) and
-    not exists (prn.getPropertyName())
-  ) or
-  exists (SpreadElement spread |
-    potentialStateSource(c).flowsToExpr(spread.getOperand())
+    not exists(prn.getPropertyName())
   )
+  or
+  exists(SpreadElement spread | potentialStateSource(c).flowsToExpr(spread.getOperand()))
 }
 
 /**
@@ -79,8 +78,7 @@ predicate usesMixins(ES5Component c) {
  */
 DataFlow::PropWrite getAnUnusedStateProperty(ReactComponent c) {
   result = getAPotentialStateAccess(c) and
-  exists (string name |
-    name = result.getPropertyName() |
+  exists(string name | name = result.getPropertyName() |
     not exists(DataFlow::PropRead prn |
       prn = getAPotentialStateAccess(c) and
       prn.getPropertyName() = name
@@ -93,8 +91,7 @@ DataFlow::PropWrite getAnUnusedStateProperty(ReactComponent c) {
  */
 DataFlow::PropRead getAnUndefinedStateProperty(ReactComponent c) {
   result = getAPotentialStateAccess(c) and
-  exists (string name |
-    name = result.getPropertyName() |
+  exists(string name | name = result.getPropertyName() |
     not exists(DataFlow::PropWrite pwn |
       pwn = getAPotentialStateAccess(c) and
       pwn.getPropertyName() = name
@@ -103,15 +100,20 @@ DataFlow::PropRead getAnUndefinedStateProperty(ReactComponent c) {
 }
 
 from ReactComponent c, DataFlow::PropRef n, string action, string nonAction
-where (
-      action = "written" and nonAction = "read" and
-      n = getAnUnusedStateProperty(c) and
-      not hasUnknownStatePropertyRead(c)
-      or
-      action = "read" and nonAction = "written" and
-      n = getAnUndefinedStateProperty(c) and
-      not hasUnknownStatePropertyWrite(c)
-      ) and
-      not hasAStateEscape(c) and
-      not usesMixins(c)
-select (FirstLineOf)c, "Component state property '" + n.getPropertyName() + "' is $@, but it is never " + nonAction + ".", n, action
+where
+  (
+    action = "written" and
+    nonAction = "read" and
+    n = getAnUnusedStateProperty(c) and
+    not hasUnknownStatePropertyRead(c)
+    or
+    action = "read" and
+    nonAction = "written" and
+    n = getAnUndefinedStateProperty(c) and
+    not hasUnknownStatePropertyWrite(c)
+  ) and
+  not hasAStateEscape(c) and
+  not usesMixins(c)
+select c.(FirstLineOf),
+  "Component state property '" + n.getPropertyName() + "' is $@, but it is never " + nonAction + ".",
+  n, action
diff --git a/javascript/ql/src/Security/CWE-020/IncompleteHostnameRegExp.ql b/javascript/ql/src/Security/CWE-020/IncompleteHostnameRegExp.ql
index 01335fbbe0a5..4cf49cbdc7b1 100644
--- a/javascript/ql/src/Security/CWE-020/IncompleteHostnameRegExp.ql
+++ b/javascript/ql/src/Security/CWE-020/IncompleteHostnameRegExp.ql
@@ -18,47 +18,40 @@ import javascript
 class Configuration extends TaintTracking::Configuration {
   Configuration() { this = "IncompleteHostnameRegExpTracking" }
 
-  override
-  predicate isSource(DataFlow::Node source) {
+  override predicate isSource(DataFlow::Node source) {
     isIncompleteHostNameRegExpPattern(source.asExpr().getStringValue(), _)
   }
 
-  override
-  predicate isSink(DataFlow::Node sink) {
-    isInterpretedAsRegExp(sink)
-  }
-
+  override predicate isSink(DataFlow::Node sink) { isInterpretedAsRegExp(sink) }
 }
 
-
 /**
  * Holds if `pattern` is a regular expression pattern for URLs with a host matched by `hostPart`,
  * and `pattern` contains a subtle mistake that allows it to match unexpected hosts.
  */
 bindingset[pattern]
 predicate isIncompleteHostNameRegExpPattern(string pattern, string hostPart) {
-  hostPart = pattern.regexpCapture(
-    "(?i).*" +
-    // an unescaped single `.`
-    "(?<!\\\\)[.]" +
-    // immediately followed by a sequence of subdomains, perhaps with some regex characters mixed in, followed by a known TLD
-    "([():|?a-z0-9-]+(\\\\)?[.](" + RegExpPatterns::commonTLD() + "))" +
-    ".*", 1)
+  hostPart = pattern
+        .regexpCapture("(?i).*" +
+            // an unescaped single `.`
+            "(?<!\\\\)[.]" +
+            // immediately followed by a sequence of subdomains, perhaps with some regex characters mixed in, followed by a known TLD
+            "([():|?a-z0-9-]+(\\\\)?[.](" + RegExpPatterns::commonTLD() + "))" + ".*", 1)
 }
 
 from Expr e, string pattern, string hostPart
 where
-      (
-        e.(RegExpLiteral).getValue() = pattern or
-        exists (Configuration cfg |
-          cfg.hasFlow(e.flow(), _) and
-          e.mayHaveStringValue(pattern)
-        )
-      ) and
-      isIncompleteHostNameRegExpPattern(pattern, hostPart)
-      and
-      // ignore patterns with capture groups after the TLD
-      not pattern.regexpMatch("(?i).*[.](" + RegExpPatterns::commonTLD() + ").*[(][?]:.*[)].*")
-
-
-select e, "This regular expression has an unescaped '.' before '" + hostPart + "', so it might match more hosts than expected."
+  (
+    e.(RegExpLiteral).getValue() = pattern
+    or
+    exists(Configuration cfg |
+      cfg.hasFlow(e.flow(), _) and
+      e.mayHaveStringValue(pattern)
+    )
+  ) and
+  isIncompleteHostNameRegExpPattern(pattern, hostPart) and
+  // ignore patterns with capture groups after the TLD
+  not pattern.regexpMatch("(?i).*[.](" + RegExpPatterns::commonTLD() + ").*[(][?]:.*[)].*")
+select e,
+  "This regular expression has an unescaped '.' before '" + hostPart +
+    "', so it might match more hosts than expected."
diff --git a/javascript/ql/src/Security/CWE-020/IncompleteUrlSubstringSanitization.ql b/javascript/ql/src/Security/CWE-020/IncompleteUrlSubstringSanitization.ql
index 97988dec805d..3964bbd86e8d 100644
--- a/javascript/ql/src/Security/CWE-020/IncompleteUrlSubstringSanitization.ql
+++ b/javascript/ql/src/Security/CWE-020/IncompleteUrlSubstringSanitization.ql
@@ -15,44 +15,52 @@ private import semmle.javascript.dataflow.InferredTypes
 
 from DataFlow::MethodCallNode call, string name, DataFlow::Node substring, string target
 where
-      (name = "indexOf" or name = "lastIndexOf" or name = "includes" or name = "startsWith" or name = "endsWith") and
-      call.getMethodName() = name and
-      substring = call.getArgument(0) and
-      substring.mayHaveStringValue(target) and
-      (
-        // target contains a domain on a common TLD, and perhaps some other URL components
-        target.regexpMatch("(?i)([a-z]*:?//)?\\.?([a-z0-9-]+\\.)+(" + RegExpPatterns::commonTLD() + ")(:[0-9]+)?/?") or
-        // target is a HTTP URL to a domain on any TLD
-        target.regexpMatch("(?i)https?://([a-z0-9-]+\\.)+([a-z]+)(:[0-9]+)?/?")
-      ) and
-      // whitelist
-      not (
-        (name = "indexOf" or name = "lastIndexOf") and
-        (
-          // arithmetic on the indexOf-result
-          any(ArithmeticExpr e).getAnOperand().getUnderlyingValue() = call.asExpr()
-          or
-          // non-trivial position check on the indexOf-result
-          exists(EqualityTest test, Expr n |
-            test.hasOperands(call.asExpr(), n) |
-            not n.getIntValue() = [-1..0]
-          )
-        )
-        or
-        // the leading dot in a subdomain sequence makes the suffix-check safe (if it is performed on the host of the url)
-        name = "endsWith" and
-        target.regexpMatch("(?i)\\.([a-z0-9-]+)(\\.[a-z0-9-]+)+")
-        or
-        // the trailing slash makes the prefix-check safe
-        (
-          name = "startsWith"
-          or
-          name = "indexOf" and
-          exists(EqualityTest test, Expr n |
-            test.hasOperands(call.asExpr(), n) and
-            n.getIntValue() = 0
-          )
-        ) and
-        target.regexpMatch(".*/")
+  (
+    name = "indexOf" or
+    name = "lastIndexOf" or
+    name = "includes" or
+    name = "startsWith" or
+    name = "endsWith"
+  ) and
+  call.getMethodName() = name and
+  substring = call.getArgument(0) and
+  substring.mayHaveStringValue(target) and
+  (
+    // target contains a domain on a common TLD, and perhaps some other URL components
+    target
+        .regexpMatch("(?i)([a-z]*:?//)?\\.?([a-z0-9-]+\\.)+(" + RegExpPatterns::commonTLD() +
+            ")(:[0-9]+)?/?")
+    or
+    // target is a HTTP URL to a domain on any TLD
+    target.regexpMatch("(?i)https?://([a-z0-9-]+\\.)+([a-z]+)(:[0-9]+)?/?")
+  ) and
+  // whitelist
+  not (
+    (name = "indexOf" or name = "lastIndexOf") and
+    (
+      // arithmetic on the indexOf-result
+      any(ArithmeticExpr e).getAnOperand().getUnderlyingValue() = call.asExpr()
+      or
+      // non-trivial position check on the indexOf-result
+      exists(EqualityTest test, Expr n | test.hasOperands(call.asExpr(), n) |
+        not n.getIntValue() = [-1 .. 0]
       )
+    )
+    or
+    // the leading dot in a subdomain sequence makes the suffix-check safe (if it is performed on the host of the url)
+    name = "endsWith" and
+    target.regexpMatch("(?i)\\.([a-z0-9-]+)(\\.[a-z0-9-]+)+")
+    or
+    // the trailing slash makes the prefix-check safe
+    (
+      name = "startsWith"
+      or
+      name = "indexOf" and
+      exists(EqualityTest test, Expr n |
+        test.hasOperands(call.asExpr(), n) and
+        n.getIntValue() = 0
+      )
+    ) and
+    target.regexpMatch(".*/")
+  )
 select call, "'$@' may be at an arbitrary position in the sanitized URL.", substring, target
diff --git a/javascript/ql/src/Security/CWE-020/IncorrectSuffixCheck.ql b/javascript/ql/src/Security/CWE-020/IncorrectSuffixCheck.ql
index 4223db7e3dff..6ac6519afdfc 100644
--- a/javascript/ql/src/Security/CWE-020/IncorrectSuffixCheck.ql
+++ b/javascript/ql/src/Security/CWE-020/IncorrectSuffixCheck.ql
@@ -9,6 +9,7 @@
  *       correctness
  *       external/cwe/cwe-020
  */
+
 import javascript
 
 /**
@@ -16,9 +17,10 @@ import javascript
  */
 class IndexOfCall extends DataFlow::MethodCallNode {
   IndexOfCall() {
-    exists (string name | name = getMethodName() |
+    exists(string name | name = getMethodName() |
       name = "indexOf" or
-      name = "lastIndexOf") and
+      name = "lastIndexOf"
+    ) and
     getNumArgument() = 1
   }
 
@@ -27,7 +29,7 @@ class IndexOfCall extends DataFlow::MethodCallNode {
     result = getReceiver() or
     result = getArgument(0)
   }
-  
+
   /**
    * Gets an `indexOf` call with the same receiver, argument, and method name, including this call itself.
    */
@@ -38,11 +40,9 @@ class IndexOfCall extends DataFlow::MethodCallNode {
   }
 
   /**
-   * Gets an expression that refers to the return value of this call. 
+   * Gets an expression that refers to the return value of this call.
    */
-  Expr getAUse() {
-    this.flowsToExpr(result)
-  }
+  Expr getAUse() { this.flowsToExpr(result) }
 }
 
 /**
@@ -66,28 +66,26 @@ class LiteralLengthExpr extends DotExpr {
   /**
    * Gets the value of the string literal whose length is taken.
    */
-  string getBaseValue() {
-    result = getBase().getStringValue()
-  }
+  string getBaseValue() { result = getBase().getStringValue() }
 }
 
 /**
  * Holds if `length` is derived from the length of the given `indexOf`-operand.
  */
 predicate isDerivedFromLength(DataFlow::Node length, DataFlow::Node operand) {
-  exists (IndexOfCall call | operand = call.getAnOperand() |
+  exists(IndexOfCall call | operand = call.getAnOperand() |
     length = getStringSource(operand).getAPropertyRead("length")
     or
-    exists (string val | val = operand.asExpr().getStringValue() |
+    exists(string val | val = operand.asExpr().getStringValue() |
       // Find a literal length with the same string constant
-      exists (LiteralLengthExpr lengthExpr |
+      exists(LiteralLengthExpr lengthExpr |
         lengthExpr.getContainer() = call.getContainer() and
         lengthExpr.getBaseValue() = val and
         length = lengthExpr.flow()
       )
       or
       // Find an integer constant that equals the length of string constant
-      exists (Expr lengthExpr |
+      exists(Expr lengthExpr |
         lengthExpr.getContainer() = call.getContainer() and
         lengthExpr.getIntValue() = val.length() and
         length = lengthExpr.flow()
@@ -97,9 +95,10 @@ predicate isDerivedFromLength(DataFlow::Node length, DataFlow::Node operand) {
   or
   isDerivedFromLength(length.getAPredecessor(), operand)
   or
-  exists (SubExpr sub |
+  exists(SubExpr sub |
     isDerivedFromLength(sub.getAnOperand().flow(), operand) and
-    length = sub.flow())
+    length = sub.flow()
+  )
 }
 
 /**
@@ -110,45 +109,43 @@ predicate isDerivedFromLength(DataFlow::Node length, DataFlow::Node operand) {
  */
 class UnsafeIndexOfComparison extends EqualityTest {
   IndexOfCall indexOf;
+
   DataFlow::Node testedValue;
 
   UnsafeIndexOfComparison() {
     hasOperands(indexOf.getAUse(), testedValue.asExpr()) and
     isDerivedFromLength(testedValue, indexOf.getReceiver()) and
     isDerivedFromLength(testedValue, indexOf.getArgument(0)) and
-
     // Ignore cases like `x.indexOf("/") === x.length - 1` that can only be bypassed if `x` is the empty string.
     // Sometimes strings are just known to be non-empty from the context, and it is unlikely to be a security issue,
     // since it's obviously not a domain name check.
     not indexOf.getArgument(0).mayHaveStringValue(any(string s | s.length() = 1)) and
-
     // Relative string length comparison, such as A.length > B.length, or (A.length - B.length) > 0
-    not exists (RelationalComparison compare |
+    not exists(RelationalComparison compare |
       isDerivedFromLength(compare.getAnOperand().flow(), indexOf.getReceiver()) and
       isDerivedFromLength(compare.getAnOperand().flow(), indexOf.getArgument(0))
     ) and
-
     // Check for indexOf being -1
-    not exists (EqualityTest test, Expr minusOne |
+    not exists(EqualityTest test, Expr minusOne |
       test.hasOperands(indexOf.getAnEquivalentIndexOfCall().getAUse(), minusOne) and
       minusOne.getIntValue() = -1
     ) and
-    
     // Check for indexOf being >1, or >=0, etc
-    not exists (RelationalComparison test |
+    not exists(RelationalComparison test |
       test.getGreaterOperand() = indexOf.getAnEquivalentIndexOfCall().getAUse() and
-      exists (int value | value = test.getLesserOperand().getIntValue() |
+      exists(int value | value = test.getLesserOperand().getIntValue() |
         value >= 0
         or
         not test.isInclusive() and
-        value = -1)
+        value = -1
+      )
     )
   }
 
-  IndexOfCall getIndexOf() {
-    result = indexOf
-  }
+  IndexOfCall getIndexOf() { result = indexOf }
 }
 
 from UnsafeIndexOfComparison comparison
-select comparison, "This suffix check is missing a length comparison to correctly handle " + comparison.getIndexOf().getMethodName() + " returning -1."
+select comparison,
+  "This suffix check is missing a length comparison to correctly handle " +
+    comparison.getIndexOf().getMethodName() + " returning -1."
diff --git a/javascript/ql/src/Security/CWE-022/TaintedPath.ql b/javascript/ql/src/Security/CWE-022/TaintedPath.ql
index b545fabafedd..f7f79c630425 100644
--- a/javascript/ql/src/Security/CWE-022/TaintedPath.ql
+++ b/javascript/ql/src/Security/CWE-022/TaintedPath.ql
@@ -20,5 +20,5 @@ import DataFlow::PathGraph
 
 from Configuration cfg, DataFlow::PathNode source, DataFlow::PathNode sink
 where cfg.hasFlowPath(source, sink)
-select sink.getNode(), source, sink, "This path depends on $@.",
-       source.getNode(), "a user-provided value"
+select sink.getNode(), source, sink, "This path depends on $@.", source.getNode(),
+  "a user-provided value"
diff --git a/javascript/ql/src/Security/CWE-078/CommandInjection.ql b/javascript/ql/src/Security/CWE-078/CommandInjection.ql
index 2e356e9fdc3a..b1ae2740defd 100644
--- a/javascript/ql/src/Security/CWE-078/CommandInjection.ql
+++ b/javascript/ql/src/Security/CWE-078/CommandInjection.ql
@@ -17,10 +17,10 @@ import semmle.javascript.security.dataflow.CommandInjection::CommandInjection
 import DataFlow::PathGraph
 
 from Configuration cfg, DataFlow::PathNode source, DataFlow::PathNode sink, DataFlow::Node highlight
-where cfg.hasFlowPath(source, sink) and
-      if cfg.isSinkWithHighlight(sink.getNode(), _) then
-        cfg.isSinkWithHighlight(sink.getNode(), highlight)
-      else
-        highlight = sink.getNode()
-select highlight, source, sink, "This command depends on $@.",
-       source.getNode(), "a user-provided value"
+where
+  cfg.hasFlowPath(source, sink) and
+  if cfg.isSinkWithHighlight(sink.getNode(), _)
+  then cfg.isSinkWithHighlight(sink.getNode(), highlight)
+  else highlight = sink.getNode()
+select highlight, source, sink, "This command depends on $@.", source.getNode(),
+  "a user-provided value"
diff --git a/javascript/ql/src/Security/CWE-079/ReflectedXss.ql b/javascript/ql/src/Security/CWE-079/ReflectedXss.ql
index c9ed51c35cd0..79ff3ce4a922 100644
--- a/javascript/ql/src/Security/CWE-079/ReflectedXss.ql
+++ b/javascript/ql/src/Security/CWE-079/ReflectedXss.ql
@@ -18,4 +18,4 @@ import DataFlow::PathGraph
 from Configuration cfg, DataFlow::PathNode source, DataFlow::PathNode sink
 where cfg.hasFlowPath(source, sink)
 select sink.getNode(), source, sink, "Cross-site scripting vulnerability due to $@.",
-       source.getNode(), "user-provided value"
+  source.getNode(), "user-provided value"
diff --git a/javascript/ql/src/Security/CWE-079/StoredXss.ql b/javascript/ql/src/Security/CWE-079/StoredXss.ql
index e0deee47b71b..fd7331fd0cc3 100644
--- a/javascript/ql/src/Security/CWE-079/StoredXss.ql
+++ b/javascript/ql/src/Security/CWE-079/StoredXss.ql
@@ -18,4 +18,4 @@ import DataFlow::PathGraph
 from Configuration cfg, DataFlow::PathNode source, DataFlow::PathNode sink
 where cfg.hasFlowPath(source, sink)
 select sink.getNode(), source, sink, "Stored cross-site scripting vulnerability due to $@.",
-       source.getNode(), "stored value"
+  source.getNode(), "stored value"
diff --git a/javascript/ql/src/Security/CWE-079/Xss.ql b/javascript/ql/src/Security/CWE-079/Xss.ql
index 7364fcad010e..29f66aac49e5 100644
--- a/javascript/ql/src/Security/CWE-079/Xss.ql
+++ b/javascript/ql/src/Security/CWE-079/Xss.ql
@@ -17,5 +17,6 @@ import DataFlow::PathGraph
 
 from Configuration cfg, DataFlow::PathNode source, DataFlow::PathNode sink
 where cfg.hasFlowPath(source, sink)
-select sink.getNode(), source, sink, sink.getNode().(Sink).getVulnerabilityKind() + " vulnerability due to $@.",
-       source.getNode(), "user-provided value"
+select sink.getNode(), source, sink,
+  sink.getNode().(Sink).getVulnerabilityKind() + " vulnerability due to $@.", source.getNode(),
+  "user-provided value"
diff --git a/javascript/ql/src/Security/CWE-089/SqlInjection.ql b/javascript/ql/src/Security/CWE-089/SqlInjection.ql
index 4df8b41a06f2..f33376fcf58c 100644
--- a/javascript/ql/src/Security/CWE-089/SqlInjection.ql
+++ b/javascript/ql/src/Security/CWE-089/SqlInjection.ql
@@ -1,14 +1,14 @@
 /**
-* @name Database query built from user-controlled sources
-* @description Building a database query from user-controlled sources is vulnerable to insertion of
-*              malicious code by the user.
-* @kind path-problem
-* @problem.severity error
-* @precision high
-* @id js/sql-injection
-* @tags security
-*       external/cwe/cwe-089
-*/
+ * @name Database query built from user-controlled sources
+ * @description Building a database query from user-controlled sources is vulnerable to insertion of
+ *              malicious code by the user.
+ * @kind path-problem
+ * @problem.severity error
+ * @precision high
+ * @id js/sql-injection
+ * @tags security
+ *       external/cwe/cwe-089
+ */
 
 import javascript
 import semmle.javascript.security.dataflow.SqlInjection
@@ -16,8 +16,11 @@ import semmle.javascript.security.dataflow.NosqlInjection
 import DataFlow::PathGraph
 
 from DataFlow::Configuration cfg, DataFlow::PathNode source, DataFlow::PathNode sink
-where (cfg instanceof SqlInjection::Configuration or
-       cfg instanceof NosqlInjection::Configuration) and
-      cfg.hasFlowPath(source, sink)
-select sink.getNode(), source, sink, "This query depends on $@.",
-       source.getNode(), "a user-provided value"
+where
+  (
+    cfg instanceof SqlInjection::Configuration or
+    cfg instanceof NosqlInjection::Configuration
+  ) and
+  cfg.hasFlowPath(source, sink)
+select sink.getNode(), source, sink, "This query depends on $@.", source.getNode(),
+  "a user-provided value"
diff --git a/javascript/ql/src/Security/CWE-094/CodeInjection.ql b/javascript/ql/src/Security/CWE-094/CodeInjection.ql
index 745dd2cd62ea..2e79e2093a44 100644
--- a/javascript/ql/src/Security/CWE-094/CodeInjection.ql
+++ b/javascript/ql/src/Security/CWE-094/CodeInjection.ql
@@ -19,4 +19,4 @@ import DataFlow::PathGraph
 from Configuration cfg, DataFlow::PathNode source, DataFlow::PathNode sink
 where cfg.hasFlowPath(source, sink)
 select sink.getNode(), source, sink, "$@ flows to here and is interpreted as code.",
-       source.getNode(), "User-provided value"
+  source.getNode(), "User-provided value"
diff --git a/javascript/ql/src/Security/CWE-094/UnsafeDynamicMethodAccess.ql b/javascript/ql/src/Security/CWE-094/UnsafeDynamicMethodAccess.ql
index b0715177412c..f28ce03c554c 100644
--- a/javascript/ql/src/Security/CWE-094/UnsafeDynamicMethodAccess.ql
+++ b/javascript/ql/src/Security/CWE-094/UnsafeDynamicMethodAccess.ql
@@ -8,10 +8,13 @@
  * @tags security
  *       external/cwe/cwe-094
  */
+
 import javascript
 import semmle.javascript.security.dataflow.UnsafeDynamicMethodAccess::UnsafeDynamicMethodAccess
 import DataFlow::PathGraph
 
 from Configuration cfg, DataFlow::PathNode source, DataFlow::PathNode sink
 where cfg.hasFlowPath(source, sink)
-select sink, source, sink, "Invocation of method derived from $@ may lead to remote code execution.", source.getNode(), "user-controlled value"
+select sink, source, sink,
+  "Invocation of method derived from $@ may lead to remote code execution.", source.getNode(),
+  "user-controlled value"
diff --git a/javascript/ql/src/Security/CWE-116/DoubleEscaping.ql b/javascript/ql/src/Security/CWE-116/DoubleEscaping.ql
index ecf0029732fb..7bc69c75b6c2 100644
--- a/javascript/ql/src/Security/CWE-116/DoubleEscaping.ql
+++ b/javascript/ql/src/Security/CWE-116/DoubleEscaping.ql
@@ -30,13 +30,16 @@ import javascript
  */
 language[monotonicAggregates]
 string getStringValue(RegExpLiteral rl) {
-  exists (RegExpTerm root | root = rl.getRoot() |
+  exists(RegExpTerm root | root = rl.getRoot() |
     result = root.(RegExpConstant).getValue()
     or
     result = strictconcat(RegExpTerm ch, int i |
-      ch = root.(RegExpSequence).getChild(i) |
-      ch.(RegExpConstant).getValue() order by i
-    )
+        ch = root.(RegExpSequence).getChild(i)
+      |
+        ch.(RegExpConstant).getValue()
+        order by
+          i
+      )
   )
 }
 
@@ -67,7 +70,7 @@ class Replacement extends DataFlow::Node {
   RegExpLiteral pattern;
 
   Replacement() {
-    exists (DataFlow::MethodCallNode mcn | this = mcn |
+    exists(DataFlow::MethodCallNode mcn | this = mcn |
       mcn.getMethodName() = "replace" and
       mcn.getArgument(0).asExpr() = pattern and
       mcn.getNumArgument() = 2 and
@@ -79,7 +82,7 @@ class Replacement extends DataFlow::Node {
    * Holds if this replacement replaces the string `input` with `output`.
    */
   predicate replaces(string input, string output) {
-    exists (DataFlow::MethodCallNode mcn |
+    exists(DataFlow::MethodCallNode mcn |
       mcn = this and
       input = getStringValue(pattern) and
       output = mcn.getArgument(1).asExpr().getStringValue()
@@ -93,7 +96,7 @@ class Replacement extends DataFlow::Node {
    * using `&`.
    */
   predicate escapes(string char, string metachar) {
-    exists (string regexp, string repl |
+    exists(string regexp, string repl |
       escapingScheme(metachar, regexp) and
       replaces(char, repl) and
       repl.regexpMatch(regexp)
@@ -107,7 +110,7 @@ class Replacement extends DataFlow::Node {
    * `&lt;`) using `<`.
    */
   predicate unescapes(string metachar, string char) {
-    exists (string regexp, string orig |
+    exists(string regexp, string orig |
       escapingScheme(metachar, regexp) and
       replaces(orig, char) and
       orig.regexpMatch(regexp)
@@ -126,11 +129,10 @@ class Replacement extends DataFlow::Node {
    * performs an escaping.
    */
   Replacement getAnEarlierEscaping(string metachar) {
-    exists (Replacement pred | pred = this.getPreviousReplacement() |
-      if pred.escapes(_, metachar) then
-        result = pred
-      else
-        result = pred.getAnEarlierEscaping(metachar)
+    exists(Replacement pred | pred = this.getPreviousReplacement() |
+      if pred.escapes(_, metachar)
+      then result = pred
+      else result = pred.getAnEarlierEscaping(metachar)
     )
   }
 
@@ -139,21 +141,21 @@ class Replacement extends DataFlow::Node {
    * performs a unescaping.
    */
   Replacement getALaterUnescaping(string metachar) {
-    exists (Replacement succ | this = succ.getPreviousReplacement() |
-      if succ.unescapes(metachar, _) then
-        result = succ
-      else
-        result = succ.getALaterUnescaping(metachar)
+    exists(Replacement succ | this = succ.getPreviousReplacement() |
+      if succ.unescapes(metachar, _)
+      then result = succ
+      else result = succ.getALaterUnescaping(metachar)
     )
   }
 }
 
 from Replacement primary, Replacement supplementary, string message, string metachar
-where primary.escapes(metachar, _) and
-      supplementary = primary.getAnEarlierEscaping(metachar) and
-      message = "may double-escape '" + metachar + "' characters from $@"
-      or
-      primary.unescapes(_, metachar) and
-      supplementary = primary.getALaterUnescaping(metachar) and
-      message = "may produce '" + metachar + "' characters that are double-unescaped $@"
+where
+  primary.escapes(metachar, _) and
+  supplementary = primary.getAnEarlierEscaping(metachar) and
+  message = "may double-escape '" + metachar + "' characters from $@"
+  or
+  primary.unescapes(_, metachar) and
+  supplementary = primary.getALaterUnescaping(metachar) and
+  message = "may produce '" + metachar + "' characters that are double-unescaped $@"
 select primary, "This replacement " + message + ".", supplementary, "here"
diff --git a/javascript/ql/src/Security/CWE-116/IncompleteSanitization.ql b/javascript/ql/src/Security/CWE-116/IncompleteSanitization.ql
index 16eb53adb45c..02587f7a0e05 100644
--- a/javascript/ql/src/Security/CWE-116/IncompleteSanitization.ql
+++ b/javascript/ql/src/Security/CWE-116/IncompleteSanitization.ql
@@ -17,9 +17,7 @@ import javascript
 /**
  * Gets a character that is commonly used as a meta-character.
  */
-string metachar() {
-  result = "'\"\\&<>\n\r\t*|{}[]%$".charAt(_)
-}
+string metachar() { result = "'\"\\&<>\n\r\t*|{}[]%$".charAt(_) }
 
 /** Gets a string matched by `e` in a `replace` call. */
 string getAMatchedString(Expr e) {
@@ -36,7 +34,7 @@ RegExpConstant getAMatchedConstant(RegExpTerm t) {
   or
   result = getAMatchedConstant(t.(RegExpGroup).getAChild())
   or
-  exists (RegExpCharacterClass recc | recc = t and not recc.isInverted() |
+  exists(RegExpCharacterClass recc | recc = t and not recc.isInverted() |
     result = getAMatchedConstant(recc.getAChild())
   )
 }
@@ -48,10 +46,11 @@ predicate isSimple(RegExpTerm t) {
   isSimple(t.(RegExpGroup).getAChild())
   or
   (
-   t instanceof RegExpAlt or
-   t instanceof RegExpCharacterClass and not t.(RegExpCharacterClass).isInverted()
+    t instanceof RegExpAlt
+    or
+    t instanceof RegExpCharacterClass and not t.(RegExpCharacterClass).isInverted()
   ) and
-  forall (RegExpTerm ch | ch = t.getAChild() | isSimple(ch))
+  forall(RegExpTerm ch | ch = t.getAChild() | isSimple(ch))
 }
 
 /**
@@ -62,7 +61,7 @@ predicate isBackslashEscape(MethodCallExpr mce, RegExpLiteral re) {
   mce.getMethodName() = "replace" and
   re = mce.getArgument(0) and
   re.isGlobal() and
-  exists (string new | new = mce.getArgument(1).getStringValue() |
+  exists(string new | new = mce.getArgument(1).getStringValue() |
     // `new` is `\$&`, `\$1` or similar
     new.regexpMatch("\\\\\\$(&|\\d)")
     or
@@ -79,17 +78,22 @@ predicate allBackslashesEscaped(DataFlow::Node nd) {
   nd = DataFlow::globalVarRef("JSON").getAMemberCall("stringify")
   or
   // check whether `nd` itself escapes backslashes
-  exists (RegExpLiteral rel | isBackslashEscape(nd.asExpr(), rel) |
+  exists(RegExpLiteral rel | isBackslashEscape(nd.asExpr(), rel) |
     // if it's a complex regexp, we conservatively assume that it probably escapes backslashes
     not isSimple(rel.getRoot()) or
     getAMatchedString(rel) = "\\"
   )
   or
   // flow through string methods
-  exists (DataFlow::MethodCallNode mc, string m |
+  exists(DataFlow::MethodCallNode mc, string m |
     m = "replace" or
-    m = "slice" or m = "substr" or m = "substring" or
-    m = "toLowerCase" or m = "toUpperCase" or m = "trim" |
+    m = "slice" or
+    m = "substr" or
+    m = "substring" or
+    m = "toLowerCase" or
+    m = "toUpperCase" or
+    m = "trim"
+  |
     mc = nd and m = mc.getMethodName() and allBackslashesEscaped(mc.getReceiver())
   )
   or
@@ -98,31 +102,32 @@ predicate allBackslashesEscaped(DataFlow::Node nd) {
 }
 
 from MethodCallExpr repl, Expr old, string msg
-where repl.getMethodName() = "replace" and
-      old = repl.getArgument(0) and
-      (
-       not old.(RegExpLiteral).isGlobal() and
-       msg = "This replaces only the first occurrence of " + old + "." and
-       // only flag if this is likely to be a sanitizer or URL encoder or decoder
-       exists (string m | m = getAMatchedString(old) |
-         // sanitizer
-         m = metachar()
-         or
-         exists (string urlEscapePattern | urlEscapePattern = "(%[0-9A-Fa-f]{2})+" |
-           // URL decoder
-           m.regexpMatch(urlEscapePattern)
-           or
-           // URL encoder
-           repl.getArgument(1).getStringValue().regexpMatch(urlEscapePattern)
-         )
-       ) and
-       // don't flag replace operations in a loop
-       not DataFlow::valueNode(repl.getReceiver()) = DataFlow::valueNode(repl).getASuccessor+()
-       or
-       exists (RegExpLiteral rel |
-         isBackslashEscape(repl, rel) and
-         not allBackslashesEscaped(DataFlow::valueNode(repl)) and
-         msg = "This does not backslash-escape the backslash character."
-       )
+where
+  repl.getMethodName() = "replace" and
+  old = repl.getArgument(0) and
+  (
+    not old.(RegExpLiteral).isGlobal() and
+    msg = "This replaces only the first occurrence of " + old + "." and
+    // only flag if this is likely to be a sanitizer or URL encoder or decoder
+    exists(string m | m = getAMatchedString(old) |
+      // sanitizer
+      m = metachar()
+      or
+      exists(string urlEscapePattern | urlEscapePattern = "(%[0-9A-Fa-f]{2})+" |
+        // URL decoder
+        m.regexpMatch(urlEscapePattern)
+        or
+        // URL encoder
+        repl.getArgument(1).getStringValue().regexpMatch(urlEscapePattern)
       )
+    ) and
+    // don't flag replace operations in a loop
+    not DataFlow::valueNode(repl.getReceiver()) = DataFlow::valueNode(repl).getASuccessor+()
+    or
+    exists(RegExpLiteral rel |
+      isBackslashEscape(repl, rel) and
+      not allBackslashesEscaped(DataFlow::valueNode(repl)) and
+      msg = "This does not backslash-escape the backslash character."
+    )
+  )
 select old, msg
diff --git a/javascript/ql/src/Security/CWE-134/TaintedFormatString.ql b/javascript/ql/src/Security/CWE-134/TaintedFormatString.ql
index bd7e9c869c79..3c12cc1d3f92 100644
--- a/javascript/ql/src/Security/CWE-134/TaintedFormatString.ql
+++ b/javascript/ql/src/Security/CWE-134/TaintedFormatString.ql
@@ -16,4 +16,4 @@ import DataFlow::PathGraph
 from Configuration cfg, DataFlow::PathNode source, DataFlow::PathNode sink
 where cfg.hasFlowPath(source, sink)
 select sink.getNode(), source, sink, "$@ flows here and is used in a format string.",
-       source.getNode(), "User-provided value"
+  source.getNode(), "User-provided value"
diff --git a/javascript/ql/src/Security/CWE-200/FileAccessToHttp.ql b/javascript/ql/src/Security/CWE-200/FileAccessToHttp.ql
index 05a28eba3c65..b116af31c4c1 100644
--- a/javascript/ql/src/Security/CWE-200/FileAccessToHttp.ql
+++ b/javascript/ql/src/Security/CWE-200/FileAccessToHttp.ql
@@ -15,4 +15,4 @@ import DataFlow::PathGraph
 from Configuration cfg, DataFlow::PathNode source, DataFlow::PathNode sink
 where cfg.hasFlowPath(source, sink)
 select sink.getNode(), source, sink, "$@ flows directly to outbound network request",
-       source.getNode(), "File data"
+  source.getNode(), "File data"
diff --git a/javascript/ql/src/Security/CWE-209/StackTraceExposure.ql b/javascript/ql/src/Security/CWE-209/StackTraceExposure.ql
index 24bb60be541b..1a4a26136759 100644
--- a/javascript/ql/src/Security/CWE-209/StackTraceExposure.ql
+++ b/javascript/ql/src/Security/CWE-209/StackTraceExposure.ql
@@ -17,5 +17,6 @@ import DataFlow::PathGraph
 
 from Configuration cfg, DataFlow::PathNode source, DataFlow::PathNode sink
 where cfg.hasFlowPath(source, sink)
-select sink.getNode(), source, sink, "Stack trace information from $@ may be exposed to an external user here.",
-       source.getNode(), "here"
+select sink.getNode(), source, sink,
+  "Stack trace information from $@ may be exposed to an external user here.", source.getNode(),
+  "here"
diff --git a/javascript/ql/src/Security/CWE-312/CleartextLogging.ql b/javascript/ql/src/Security/CWE-312/CleartextLogging.ql
index 03c86d327556..2d65ae9c471e 100644
--- a/javascript/ql/src/Security/CWE-312/CleartextLogging.ql
+++ b/javascript/ql/src/Security/CWE-312/CleartextLogging.ql
@@ -20,21 +20,22 @@ import DataFlow::PathGraph
  * Holds if `tl` is used in a browser environment.
  */
 predicate inBrowserEnvironment(TopLevel tl) {
-  tl instanceof InlineScript or
-  tl instanceof CodeInAttribute or
-  exists (GlobalVarAccess e |
-    e.getTopLevel() = tl |
-    e.getName() = "window"
-  ) or
-  exists (Module m | inBrowserEnvironment(m) |
+  tl instanceof InlineScript
+  or
+  tl instanceof CodeInAttribute
+  or
+  exists(GlobalVarAccess e | e.getTopLevel() = tl | e.getName() = "window")
+  or
+  exists(Module m | inBrowserEnvironment(m) |
     tl = m.getAnImportedModule() or
     m = tl.(Module).getAnImportedModule()
   )
 }
 
 from Configuration cfg, DataFlow::PathNode source, DataFlow::PathNode sink
-where cfg.hasFlowPath(source, sink) and
-      // ignore logging to the browser console (even though it is not a good practice)
-      not inBrowserEnvironment(sink.getNode().asExpr().getTopLevel())
+where
+  cfg.hasFlowPath(source, sink) and
+  // ignore logging to the browser console (even though it is not a good practice)
+  not inBrowserEnvironment(sink.getNode().asExpr().getTopLevel())
 select sink.getNode(), source, sink, "Sensitive data returned by $@ is logged here.",
-       source.getNode(), source.getNode().(Source).describe()
+  source.getNode(), source.getNode().(Source).describe()
diff --git a/javascript/ql/src/Security/CWE-312/CleartextStorage.ql b/javascript/ql/src/Security/CWE-312/CleartextStorage.ql
index d54d51b024ce..b59f8e74844b 100644
--- a/javascript/ql/src/Security/CWE-312/CleartextStorage.ql
+++ b/javascript/ql/src/Security/CWE-312/CleartextStorage.ql
@@ -19,4 +19,4 @@ import DataFlow::PathGraph
 from Configuration cfg, DataFlow::PathNode source, DataFlow::PathNode sink
 where cfg.hasFlowPath(source, sink)
 select sink.getNode(), source, sink, "Sensitive data returned by $@ is stored here.",
-       source.getNode(), source.getNode().(Source).describe()
+  source.getNode(), source.getNode().(Source).describe()
diff --git a/javascript/ql/src/Security/CWE-313/PasswordInConfigurationFile.ql b/javascript/ql/src/Security/CWE-313/PasswordInConfigurationFile.ql
index 99c8c46c4766..999b4609d957 100644
--- a/javascript/ql/src/Security/CWE-313/PasswordInConfigurationFile.ql
+++ b/javascript/ql/src/Security/CWE-313/PasswordInConfigurationFile.ql
@@ -21,13 +21,12 @@ import javascript
  * Dependencies in `package.json` files are excluded by this predicate.
  */
 predicate config(string key, string val, Locatable valElement) {
-  exists (JSONObject obj |
-    not exists(PackageJSON p | obj = p.getADependenciesObject(_)) |
+  exists(JSONObject obj | not exists(PackageJSON p | obj = p.getADependenciesObject(_)) |
     obj.getPropValue(key) = valElement and
     val = valElement.(JSONString).getValue()
   )
   or
-  exists (YAMLMapping m, YAMLString keyElement |
+  exists(YAMLMapping m, YAMLString keyElement |
     m.maps(keyElement, valElement) and
     key = keyElement.getValue() and
     val = valElement.(YAMLString).getValue()
@@ -43,10 +42,14 @@ predicate exclude(File f) {
 }
 
 from string key, string val, Locatable valElement
-where config(key, val, valElement) and val != "" and
-      (key.toLowerCase() = "password"
-       or
-       key.toLowerCase() != "readme" and
-       val.regexpMatch("(?is).*password\\s*=(?!\\s*;).*")) and
-      not exclude(valElement.getFile())
+where
+  config(key, val, valElement) and
+  val != "" and
+  (
+    key.toLowerCase() = "password"
+    or
+    key.toLowerCase() != "readme" and
+    val.regexpMatch("(?is).*password\\s*=(?!\\s*;).*")
+  ) and
+  not exclude(valElement.getFile())
 select valElement, "Avoid plaintext passwords in configuration files."
diff --git a/javascript/ql/src/Security/CWE-327/BrokenCryptoAlgorithm.ql b/javascript/ql/src/Security/CWE-327/BrokenCryptoAlgorithm.ql
index 501041a4b2fb..efc5714c8f6e 100644
--- a/javascript/ql/src/Security/CWE-327/BrokenCryptoAlgorithm.ql
+++ b/javascript/ql/src/Security/CWE-327/BrokenCryptoAlgorithm.ql
@@ -15,7 +15,9 @@ import semmle.javascript.security.SensitiveActions
 import DataFlow::PathGraph
 
 from Configuration cfg, DataFlow::PathNode source, DataFlow::PathNode sink
-where cfg.hasFlowPath(source, sink) and
-      not source.getNode().asExpr() instanceof CleartextPasswordExpr // flagged by js/insufficient-password-hash
-select sink.getNode(), source, sink, "Sensitive data from $@ is used in a broken or weak cryptographic algorithm.",
-       source.getNode(), source.getNode().(Source).describe()
+where
+  cfg.hasFlowPath(source, sink) and
+  not source.getNode().asExpr() instanceof CleartextPasswordExpr // flagged by js/insufficient-password-hash
+select sink.getNode(), source, sink,
+  "Sensitive data from $@ is used in a broken or weak cryptographic algorithm.", source.getNode(),
+  source.getNode().(Source).describe()
diff --git a/javascript/ql/src/Security/CWE-338/InsecureRandomness.ql b/javascript/ql/src/Security/CWE-338/InsecureRandomness.ql
index 5b48a98740ea..6db8ea0054e0 100644
--- a/javascript/ql/src/Security/CWE-338/InsecureRandomness.ql
+++ b/javascript/ql/src/Security/CWE-338/InsecureRandomness.ql
@@ -10,6 +10,7 @@
  * @tags security
  *       external/cwe/cwe-338
  */
+
 import javascript
 import semmle.javascript.security.dataflow.InsecureRandomness::InsecureRandomness
 import DataFlow::PathGraph
@@ -17,4 +18,4 @@ import DataFlow::PathGraph
 from Configuration cfg, DataFlow::PathNode source, DataFlow::PathNode sink
 where cfg.hasFlowPath(source, sink)
 select sink.getNode(), source, sink, "Cryptographically insecure $@ in a security context.",
-       source.getNode(), "random value"
+  source.getNode(), "random value"
diff --git a/javascript/ql/src/Security/CWE-346/CorsMisconfigurationForCredentials.ql b/javascript/ql/src/Security/CWE-346/CorsMisconfigurationForCredentials.ql
index 2c1aef77795a..2df657b59f7e 100644
--- a/javascript/ql/src/Security/CWE-346/CorsMisconfigurationForCredentials.ql
+++ b/javascript/ql/src/Security/CWE-346/CorsMisconfigurationForCredentials.ql
@@ -10,7 +10,6 @@
  *       external/cwe/cwe-639
  */
 
-
 import javascript
 import semmle.javascript.security.dataflow.CorsMisconfigurationForCredentials::CorsMisconfigurationForCredentials
 import DataFlow::PathGraph
@@ -18,5 +17,5 @@ import DataFlow::PathGraph
 from Configuration cfg, DataFlow::PathNode source, DataFlow::PathNode sink
 where cfg.hasFlowPath(source, sink)
 select sink.getNode(), source, sink, "$@ leak vulnerability due to $@.",
-       sink.getNode().(Sink).getCredentialsHeader(), "Credential",
-       source.getNode(), "a misconfigured CORS header value"
+  sink.getNode().(Sink).getCredentialsHeader(), "Credential", source.getNode(),
+  "a misconfigured CORS header value"
diff --git a/javascript/ql/src/Security/CWE-352/MissingCsrfMiddleware.ql b/javascript/ql/src/Security/CWE-352/MissingCsrfMiddleware.ql
index 9a1a3e1aa883..192f32dc79b1 100644
--- a/javascript/ql/src/Security/CWE-352/MissingCsrfMiddleware.ql
+++ b/javascript/ql/src/Security/CWE-352/MissingCsrfMiddleware.ql
@@ -40,7 +40,7 @@ predicate hasCookieMiddleware(Express::RouteHandlerExpr expr, Express::RouteHand
  * ```
  */
 DataFlow::CallNode csrfMiddlewareCreation() {
-  exists (DataFlow::SourceNode callee | result = callee.getACall() |
+  exists(DataFlow::SourceNode callee | result = callee.getACall() |
     callee = DataFlow::moduleImport("csurf")
     or
     callee = DataFlow::moduleImport("lusca") and
@@ -57,18 +57,17 @@ predicate hasCsrfMiddleware(Express::RouteHandlerExpr handler) {
   csrfMiddlewareCreation().flowsToExpr(handler.getAMatchingAncestor())
 }
 
-from Express::RouterDefinition router, Express::RouteSetup setup, Express::RouteHandlerExpr handler,
-     Express::RouteHandlerExpr cookie
-where router = setup.getRouter()
-  and handler = setup.getARouteHandlerExpr()
-
-  and hasCookieMiddleware(handler, cookie)
-  and not hasCsrfMiddleware(handler)
-
+from
+  Express::RouterDefinition router, Express::RouteSetup setup, Express::RouteHandlerExpr handler,
+  Express::RouteHandlerExpr cookie
+where
+  router = setup.getRouter() and
+  handler = setup.getARouteHandlerExpr() and
+  hasCookieMiddleware(handler, cookie) and
+  not hasCsrfMiddleware(handler) and
   // Only warn for the last handler in a chain.
-  and handler.isLastHandler()
-
+  handler.isLastHandler() and
   // Only warn for dangerous for handlers, such as for POST and PUT.
-  and not setup.getRequestMethod().isSafe()
-
-select cookie, "This cookie middleware is serving a request handler $@ without CSRF protection.", handler, "here"
+  not setup.getRequestMethod().isSafe()
+select cookie, "This cookie middleware is serving a request handler $@ without CSRF protection.",
+  handler, "here"
diff --git a/javascript/ql/src/Security/CWE-400/RemotePropertyInjection.ql b/javascript/ql/src/Security/CWE-400/RemotePropertyInjection.ql
index 1dafa5b2dfcf..818d3ab6af1b 100644
--- a/javascript/ql/src/Security/CWE-400/RemotePropertyInjection.ql
+++ b/javascript/ql/src/Security/CWE-400/RemotePropertyInjection.ql
@@ -9,7 +9,7 @@
  * @tags security
  *       external/cwe/cwe-250
  *       external/cwe/cwe-400
-  */
+ */
 
 import javascript
 import semmle.javascript.security.dataflow.RemotePropertyInjection::RemotePropertyInjection
@@ -18,4 +18,4 @@ import DataFlow::PathGraph
 from Configuration cfg, DataFlow::PathNode source, DataFlow::PathNode sink
 where cfg.hasFlowPath(source, sink)
 select sink.getNode(), source, sink, "A $@ is used as" + sink.getNode().(Sink).getMessage(),
-       source.getNode(), "user-provided value"
+  source.getNode(), "user-provided value"
diff --git a/javascript/ql/src/Security/CWE-502/UnsafeDeserialization.ql b/javascript/ql/src/Security/CWE-502/UnsafeDeserialization.ql
index 8795546883e5..29251e1c5e65 100644
--- a/javascript/ql/src/Security/CWE-502/UnsafeDeserialization.ql
+++ b/javascript/ql/src/Security/CWE-502/UnsafeDeserialization.ql
@@ -16,5 +16,4 @@ import DataFlow::PathGraph
 
 from Configuration cfg, DataFlow::PathNode source, DataFlow::PathNode sink
 where cfg.hasFlowPath(source, sink)
-select sink.getNode(), source, sink, "Unsafe deserialization of $@.",
-       source.getNode(), "user input"
+select sink.getNode(), source, sink, "Unsafe deserialization of $@.", source.getNode(), "user input"
diff --git a/javascript/ql/src/Security/CWE-506/HardcodedDataInterpretedAsCode.ql b/javascript/ql/src/Security/CWE-506/HardcodedDataInterpretedAsCode.ql
index e274ac45d37a..9c5bca8dc0e3 100644
--- a/javascript/ql/src/Security/CWE-506/HardcodedDataInterpretedAsCode.ql
+++ b/javascript/ql/src/Security/CWE-506/HardcodedDataInterpretedAsCode.ql
@@ -18,5 +18,5 @@ import DataFlow::PathGraph
 from Configuration cfg, DataFlow::PathNode source, DataFlow::PathNode sink
 where cfg.hasFlowPath(source, sink)
 select sink.getNode(), source, sink,
-       "Hard-coded data from $@ is interpreted as " + sink.getNode().(Sink).getKind() + ".",
-       source.getNode(), "here"
+  "Hard-coded data from $@ is interpreted as " + sink.getNode().(Sink).getKind() + ".",
+  source.getNode(), "here"
diff --git a/javascript/ql/src/Security/CWE-601/ClientSideUrlRedirect.ql b/javascript/ql/src/Security/CWE-601/ClientSideUrlRedirect.ql
index 9edc3e739d8a..c6748b820748 100644
--- a/javascript/ql/src/Security/CWE-601/ClientSideUrlRedirect.ql
+++ b/javascript/ql/src/Security/CWE-601/ClientSideUrlRedirect.ql
@@ -18,5 +18,5 @@ import DataFlow::PathGraph
 
 from Configuration cfg, DataFlow::PathNode source, DataFlow::PathNode sink
 where cfg.hasFlowPath(source, sink)
-select sink.getNode(), source, sink, "Untrusted URL redirection due to $@.",
-       source.getNode(), "user-provided value"
+select sink.getNode(), source, sink, "Untrusted URL redirection due to $@.", source.getNode(),
+  "user-provided value"
diff --git a/javascript/ql/src/Security/CWE-601/ServerSideUrlRedirect.ql b/javascript/ql/src/Security/CWE-601/ServerSideUrlRedirect.ql
index a591f9d1d52b..a39144d2478f 100644
--- a/javascript/ql/src/Security/CWE-601/ServerSideUrlRedirect.ql
+++ b/javascript/ql/src/Security/CWE-601/ServerSideUrlRedirect.ql
@@ -16,5 +16,5 @@ import DataFlow::PathGraph
 
 from Configuration cfg, DataFlow::PathNode source, DataFlow::PathNode sink
 where cfg.hasFlowPath(source, sink)
-select sink.getNode(), source, sink, "Untrusted URL redirection due to $@.",
-       source.getNode(), "user-provided value"
+select sink.getNode(), source, sink, "Untrusted URL redirection due to $@.", source.getNode(),
+  "user-provided value"
diff --git a/javascript/ql/src/Security/CWE-611/Xxe.ql b/javascript/ql/src/Security/CWE-611/Xxe.ql
index 3f2cb797e1c6..3334a0db498f 100644
--- a/javascript/ql/src/Security/CWE-611/Xxe.ql
+++ b/javascript/ql/src/Security/CWE-611/Xxe.ql
@@ -17,5 +17,6 @@ import DataFlow::PathGraph
 
 from Configuration cfg, DataFlow::PathNode source, DataFlow::PathNode sink
 where cfg.hasFlowPath(source, sink)
-select sink.getNode(), source, sink, "A $@ is parsed as XML without guarding against external entity expansion.",
-       source.getNode(), "user-provided value"
+select sink.getNode(), source, sink,
+  "A $@ is parsed as XML without guarding against external entity expansion.", source.getNode(),
+  "user-provided value"
diff --git a/javascript/ql/src/Security/CWE-640/HostHeaderPoisoningInEmailGeneration.ql b/javascript/ql/src/Security/CWE-640/HostHeaderPoisoningInEmailGeneration.ql
index c5749967e2c2..c8e581bacf9a 100644
--- a/javascript/ql/src/Security/CWE-640/HostHeaderPoisoningInEmailGeneration.ql
+++ b/javascript/ql/src/Security/CWE-640/HostHeaderPoisoningInEmailGeneration.ql
@@ -16,5 +16,6 @@ import DataFlow::PathGraph
 
 from Configuration cfg, DataFlow::PathNode source, DataFlow::PathNode sink
 where cfg.hasFlowPath(source, sink)
-select sink.getNode(), source, sink, "Links in this email can be hijacked by poisoning the HTTP host header $@.",
-       source.getNode(), "here"
+select sink.getNode(), source, sink,
+  "Links in this email can be hijacked by poisoning the HTTP host header $@.", source.getNode(),
+  "here"
diff --git a/javascript/ql/src/Security/CWE-643/XpathInjection.ql b/javascript/ql/src/Security/CWE-643/XpathInjection.ql
index 8fe847b8f16c..5f30bb3ee217 100644
--- a/javascript/ql/src/Security/CWE-643/XpathInjection.ql
+++ b/javascript/ql/src/Security/CWE-643/XpathInjection.ql
@@ -17,4 +17,4 @@ import DataFlow::PathGraph
 from Configuration cfg, DataFlow::PathNode source, DataFlow::PathNode sink
 where cfg.hasFlowPath(source, sink)
 select sink.getNode(), source, sink, "$@ flows here and is used in an XPath expression.",
-       source.getNode(), "User-provided value"
+  source.getNode(), "User-provided value"
diff --git a/javascript/ql/src/Security/CWE-730/RegExpInjection.ql b/javascript/ql/src/Security/CWE-730/RegExpInjection.ql
index 578733974470..ccff952e0958 100644
--- a/javascript/ql/src/Security/CWE-730/RegExpInjection.ql
+++ b/javascript/ql/src/Security/CWE-730/RegExpInjection.ql
@@ -19,4 +19,4 @@ import DataFlow::PathGraph
 from Configuration cfg, DataFlow::PathNode source, DataFlow::PathNode sink
 where cfg.hasFlowPath(source, sink)
 select sink.getNode(), source, sink, "This regular expression is constructed from a $@.",
-       source.getNode(), "user-provided value"
+  source.getNode(), "user-provided value"
diff --git a/javascript/ql/src/Security/CWE-754/UnvalidatedDynamicMethodCall.ql b/javascript/ql/src/Security/CWE-754/UnvalidatedDynamicMethodCall.ql
index df3b2e8aa162..a47265664517 100644
--- a/javascript/ql/src/Security/CWE-754/UnvalidatedDynamicMethodCall.ql
+++ b/javascript/ql/src/Security/CWE-754/UnvalidatedDynamicMethodCall.ql
@@ -17,5 +17,5 @@ import DataFlow::PathGraph
 from Configuration cfg, DataFlow::PathNode source, DataFlow::PathNode sink
 where cfg.hasFlowPath(source, sink)
 select sink.getNode(), source, sink,
-       "Invocation of method with $@ name may dispatch to unexpected target and cause an exception.",
-       source.getNode(), "user-controlled"
+  "Invocation of method with $@ name may dispatch to unexpected target and cause an exception.",
+  source.getNode(), "user-controlled"
diff --git a/javascript/ql/src/Security/CWE-770/MissingRateLimiting.ql b/javascript/ql/src/Security/CWE-770/MissingRateLimiting.ql
index d891ec706246..5e011a0ca7e5 100644
--- a/javascript/ql/src/Security/CWE-770/MissingRateLimiting.ql
+++ b/javascript/ql/src/Security/CWE-770/MissingRateLimiting.ql
@@ -17,9 +17,12 @@ import javascript
 import semmle.javascript.security.dataflow.MissingRateLimiting
 import semmle.javascript.RestrictedLocations
 
-from ExpensiveRouteHandler r, Express::RouteHandlerExpr rhe,
-     string explanation, DataFlow::Node reference, string referenceLabel
-where r = rhe.getBody() and
-      r.explain(explanation, reference, referenceLabel) and
-      not rhe instanceof RateLimitedRouteHandlerExpr
-select (FirstLineOf)rhe, "This route handler " + explanation + ", but is not rate-limited.", reference, referenceLabel
+from
+  ExpensiveRouteHandler r, Express::RouteHandlerExpr rhe, string explanation,
+  DataFlow::Node reference, string referenceLabel
+where
+  r = rhe.getBody() and
+  r.explain(explanation, reference, referenceLabel) and
+  not rhe instanceof RateLimitedRouteHandlerExpr
+select rhe.(FirstLineOf), "This route handler " + explanation + ", but is not rate-limited.",
+  reference, referenceLabel
diff --git a/javascript/ql/src/Security/CWE-776/XmlBomb.ql b/javascript/ql/src/Security/CWE-776/XmlBomb.ql
index 878d01d6f4df..a9f9647ca35d 100644
--- a/javascript/ql/src/Security/CWE-776/XmlBomb.ql
+++ b/javascript/ql/src/Security/CWE-776/XmlBomb.ql
@@ -17,5 +17,6 @@ import DataFlow::PathGraph
 
 from Configuration cfg, DataFlow::PathNode source, DataFlow::PathNode sink
 where cfg.hasFlowPath(source, sink)
-select sink.getNode(), source, sink, "A $@ is parsed as XML without guarding against uncontrolled entity expansion.",
-       source.getNode(), "user-provided value"
+select sink.getNode(), source, sink,
+  "A $@ is parsed as XML without guarding against uncontrolled entity expansion.", source.getNode(),
+  "user-provided value"
diff --git a/javascript/ql/src/Security/CWE-798/HardcodedCredentials.ql b/javascript/ql/src/Security/CWE-798/HardcodedCredentials.ql
index 9c6959989e76..d6d48cb5ff74 100644
--- a/javascript/ql/src/Security/CWE-798/HardcodedCredentials.ql
+++ b/javascript/ql/src/Security/CWE-798/HardcodedCredentials.ql
@@ -17,11 +17,13 @@ private import semmle.javascript.security.dataflow.HardcodedCredentials::Hardcod
 import DataFlow::PathGraph
 
 from Configuration cfg, DataFlow::PathNode source, DataFlow::PathNode sink, string value
-where cfg.hasFlowPath(source, sink) and
-      // use source value in message if it's available
-      if source.getNode().asExpr() instanceof ConstantString then
-        value = "The hard-coded value \"" + source.getNode().asExpr().(ConstantString).getStringValue() + "\""
-      else
-        value = "This hard-coded value"
-select source.getNode(), source, sink, value + " is used as $@.",
-       sink.getNode(), sink.getNode().(Sink).getKind()
+where
+  cfg.hasFlowPath(source, sink) and
+  // use source value in message if it's available
+  if source.getNode().asExpr() instanceof ConstantString
+  then
+    value = "The hard-coded value \"" + source.getNode().asExpr().(ConstantString).getStringValue() +
+        "\""
+  else value = "This hard-coded value"
+select source.getNode(), source, sink, value + " is used as $@.", sink.getNode(),
+  sink.getNode().(Sink).getKind()
diff --git a/javascript/ql/src/Security/CWE-807/ConditionalBypass.ql b/javascript/ql/src/Security/CWE-807/ConditionalBypass.ql
index 8470dc7a4c38..e6359281614a 100644
--- a/javascript/ql/src/Security/CWE-807/ConditionalBypass.ql
+++ b/javascript/ql/src/Security/CWE-807/ConditionalBypass.ql
@@ -27,20 +27,14 @@ predicate flowsToGuardExpr(DataFlow::Node nd, SensitiveActionGuardConditional gu
  * `var ok = x == y; if (ok) login()`.
  */
 class SensitiveActionGuardComparison extends Comparison {
-
   SensitiveActionGuardConditional guard;
 
-  SensitiveActionGuardComparison() {
-    flowsToGuardExpr(DataFlow::valueNode(this), guard)
-  }
+  SensitiveActionGuardComparison() { flowsToGuardExpr(DataFlow::valueNode(this), guard) }
 
   /**
    * Gets the guard that uses this comparison.
    */
-  SensitiveActionGuardConditional getGuard() {
-    result = guard
-  }
-
+  SensitiveActionGuardConditional getGuard() { result = guard }
 }
 
 /**
@@ -48,17 +42,11 @@ class SensitiveActionGuardComparison extends Comparison {
  * This sink should not be presented to the client of this query.
  */
 class SensitiveActionGuardComparisonOperand extends Sink {
-
   SensitiveActionGuardComparison comparison;
 
-  SensitiveActionGuardComparisonOperand() {
-    asExpr() = comparison.getAnOperand()
-  }
-
-  override SensitiveAction getAction() {
-    result = comparison.getGuard().getAction()
-  }
+  SensitiveActionGuardComparisonOperand() { asExpr() = comparison.getAnOperand() }
 
+  override SensitiveAction getAction() { result = comparison.getGuard().getAction() }
 }
 
 /**
@@ -67,19 +55,27 @@ class SensitiveActionGuardComparisonOperand extends Sink {
  * If flow from `source` taints `sink`, then an attacker can
  * control if `action` should be executed or not.
  */
-predicate isTaintedGuardForSensitiveAction(DataFlow::PathNode sink, DataFlow::PathNode source, SensitiveAction action) {
+predicate isTaintedGuardForSensitiveAction(
+  DataFlow::PathNode sink, DataFlow::PathNode source, SensitiveAction action
+) {
   action = sink.getNode().(Sink).getAction() and
   // exclude the intermediary sink
   not sink.getNode() instanceof SensitiveActionGuardComparisonOperand and
-  exists (Configuration cfg  |
+  exists(Configuration cfg |
     // ordinary taint tracking to a guard
-    cfg.hasFlowPath(source, sink) or
+    cfg.hasFlowPath(source, sink)
+    or
     // taint tracking to both operands of a guard comparison
-    exists (SensitiveActionGuardComparison cmp, DataFlow::PathNode lSource, DataFlow::PathNode rSource,
-            DataFlow::PathNode lSink, DataFlow::PathNode rSink |
+    exists(
+      SensitiveActionGuardComparison cmp, DataFlow::PathNode lSource, DataFlow::PathNode rSource,
+      DataFlow::PathNode lSink, DataFlow::PathNode rSink
+    |
       sink.getNode() = cmp.getGuard() and
-      cfg.hasFlowPath(lSource, lSink) and lSink.getNode() = DataFlow::valueNode(cmp.getLeftOperand()) and
-      cfg.hasFlowPath(rSource, rSink) and rSink.getNode() = DataFlow::valueNode(cmp.getRightOperand()) |
+      cfg.hasFlowPath(lSource, lSink) and
+      lSink.getNode() = DataFlow::valueNode(cmp.getLeftOperand()) and
+      cfg.hasFlowPath(rSource, rSink) and
+      rSink.getNode() = DataFlow::valueNode(cmp.getRightOperand())
+    |
       source = lSource or
       source = rSource
     )
@@ -92,26 +88,28 @@ predicate isTaintedGuardForSensitiveAction(DataFlow::PathNode sink, DataFlow::Pa
  * Example: `if (e) return; action(x)`.
  */
 predicate isEarlyAbortGuard(DataFlow::PathNode e, SensitiveAction action) {
-  exists (IfStmt guard |
+  exists(IfStmt guard |
     // `e` is in the condition of an if-statement ...
     e.getNode().(Sink).asExpr().getParentExpr*() = guard.getCondition() and
     // ... where the then-branch always throws or returns
-    exists (Stmt abort |
+    exists(Stmt abort |
       abort instanceof ThrowStmt or
-      abort instanceof ReturnStmt |
+      abort instanceof ReturnStmt
+    |
       abort.nestedIn(guard) and
-      abort.getBasicBlock().(ReachableBasicBlock).postDominates(guard.getThen().getBasicBlock() )
+      abort.getBasicBlock().(ReachableBasicBlock).postDominates(guard.getThen().getBasicBlock())
     ) and
     // ... and the else-branch does not exist
-    not exists (guard.getElse()) |
+    not exists(guard.getElse())
+  |
     // ... and `action` is outside the if-statement
     not action.asExpr().getEnclosingStmt().nestedIn(guard)
   )
 }
 
 from DataFlow::PathNode source, DataFlow::PathNode sink, SensitiveAction action
-where isTaintedGuardForSensitiveAction(sink, source, action) and
-      not isEarlyAbortGuard(sink, action)
+where
+  isTaintedGuardForSensitiveAction(sink, source, action) and
+  not isEarlyAbortGuard(sink, action)
 select sink.getNode(), source, sink, "This condition guards a sensitive $@, but $@ controls it.",
-    action, "action",
-    source.getNode(), "a user-provided value"
+  action, "action", source.getNode(), "a user-provided value"
diff --git a/javascript/ql/src/Security/CWE-807/DifferentKindsComparisonBypass.ql b/javascript/ql/src/Security/CWE-807/DifferentKindsComparisonBypass.ql
index cfc42889962c..476112e0781f 100644
--- a/javascript/ql/src/Security/CWE-807/DifferentKindsComparisonBypass.ql
+++ b/javascript/ql/src/Security/CWE-807/DifferentKindsComparisonBypass.ql
@@ -9,15 +9,20 @@
  *       external/cwe/cwe-807
  *       external/cwe/cwe-290
  */
+
 import javascript
 import semmle.javascript.security.dataflow.DifferentKindsComparisonBypass::DifferentKindsComparisonBypass
 
 from DifferentKindsComparison cmp, DataFlow::Node lSource, DataFlow::Node rSource
-where lSource = cmp.getLSource() and rSource = cmp.getRSource() and
-      not (
-        // Standard names for the double submit cookie pattern (CSRF protection)
-        exists (DataFlow::PropRead s | s = lSource or s = rSource |
-          s.getPropertyName().regexpMatch("(?i).*(csrf|state|token).*")
-        )
-      )
-select cmp, "This comparison of $@ and $@ is a potential security risk since it is controlled by the user.", lSource, lSource.toString(), rSource, rSource.toString()
\ No newline at end of file
+where
+  lSource = cmp.getLSource() and
+  rSource = cmp.getRSource() and
+  not (
+    // Standard names for the double submit cookie pattern (CSRF protection)
+    exists(DataFlow::PropRead s | s = lSource or s = rSource |
+      s.getPropertyName().regexpMatch("(?i).*(csrf|state|token).*")
+    )
+  )
+select cmp,
+  "This comparison of $@ and $@ is a potential security risk since it is controlled by the user.",
+  lSource, lSource.toString(), rSource, rSource.toString()
diff --git a/javascript/ql/src/Security/CWE-843/TypeConfusionThroughParameterTampering.ql b/javascript/ql/src/Security/CWE-843/TypeConfusionThroughParameterTampering.ql
index c2bad5090151..17788e66d68f 100644
--- a/javascript/ql/src/Security/CWE-843/TypeConfusionThroughParameterTampering.ql
+++ b/javascript/ql/src/Security/CWE-843/TypeConfusionThroughParameterTampering.ql
@@ -15,5 +15,5 @@ import DataFlow::PathGraph
 
 from Configuration cfg, DataFlow::PathNode source, DataFlow::PathNode sink
 where cfg.hasFlowPath(source, sink)
-select sink.getNode(), source, sink, "Potential type confusion for $@.",
-       source.getNode(), "HTTP request parameter"
+select sink.getNode(), source, sink, "Potential type confusion for $@.", source.getNode(),
+  "HTTP request parameter"
diff --git a/javascript/ql/src/Security/CWE-916/InsufficientPasswordHash.ql b/javascript/ql/src/Security/CWE-916/InsufficientPasswordHash.ql
index e2a94d06ae07..2f1df96f3ec9 100644
--- a/javascript/ql/src/Security/CWE-916/InsufficientPasswordHash.ql
+++ b/javascript/ql/src/Security/CWE-916/InsufficientPasswordHash.ql
@@ -15,5 +15,5 @@ import DataFlow::PathGraph
 
 from Configuration cfg, DataFlow::PathNode source, DataFlow::PathNode sink
 where cfg.hasFlowPath(source, sink)
-select sink.getNode(), source, sink, "Password from $@ is hashed insecurely.",
-       source.getNode(), source.getNode().(Source).describe()
+select sink.getNode(), source, sink, "Password from $@ is hashed insecurely.", source.getNode(),
+  source.getNode().(Source).describe()
diff --git a/javascript/ql/src/Security/CWE-918/RequestForgery.ql b/javascript/ql/src/Security/CWE-918/RequestForgery.ql
index c1d80a78a3e9..43096ea62409 100644
--- a/javascript/ql/src/Security/CWE-918/RequestForgery.ql
+++ b/javascript/ql/src/Security/CWE-918/RequestForgery.ql
@@ -14,7 +14,8 @@ import semmle.javascript.security.dataflow.RequestForgery::RequestForgery
 import DataFlow::PathGraph
 
 from Configuration cfg, DataFlow::PathNode source, DataFlow::PathNode sink, DataFlow::Node request
-where cfg.hasFlowPath(source, sink) and
-      request = sink.getNode().(Sink).getARequest()
-select request, source, sink, "The $@ of this request depends on $@.",
-       sink.getNode(), sink.getNode().(Sink).getKind(), source, "a user-provided value"
+where
+  cfg.hasFlowPath(source, sink) and
+  request = sink.getNode().(Sink).getARequest()
+select request, source, sink, "The $@ of this request depends on $@.", sink.getNode(),
+  sink.getNode().(Sink).getKind(), source, "a user-provided value"
diff --git a/javascript/ql/src/StandardLibrary/ParseIntRadix.ql b/javascript/ql/src/StandardLibrary/ParseIntRadix.ql
index 7ae4c27c1f9d..409909d45a24 100644
--- a/javascript/ql/src/StandardLibrary/ParseIntRadix.ql
+++ b/javascript/ql/src/StandardLibrary/ParseIntRadix.ql
@@ -15,6 +15,7 @@
 import javascript
 
 from DataFlow::CallNode parseInt
-where parseInt = DataFlow::globalVarRef("parseInt").getACall() and
-      parseInt.getNumArgument() = 1
-select parseInt, "Missing radix parameter."
\ No newline at end of file
+where
+  parseInt = DataFlow::globalVarRef("parseInt").getACall() and
+  parseInt.getNumArgument() = 1
+select parseInt, "Missing radix parameter."
diff --git a/javascript/ql/src/Statements/DanglingElse.ql b/javascript/ql/src/Statements/DanglingElse.ql
index 28c95cfaea1c..215399a0066c 100644
--- a/javascript/ql/src/Statements/DanglingElse.ql
+++ b/javascript/ql/src/Statements/DanglingElse.ql
@@ -17,11 +17,7 @@ import javascript
  * A token that is relevant for this query, that is, an `if`, `else` or `}` token.
  */
 class RelevantToken extends Token {
-  RelevantToken() {
-    exists (string v | v = getValue() |
-      v = "if" or v = "else" or v = "}"
-    )
-  }
+  RelevantToken() { exists(string v | v = getValue() | v = "if" or v = "else" or v = "}") }
 }
 
 /**
@@ -54,9 +50,10 @@ int semanticIndent(RelevantToken tk) {
   not prevTokenOnSameLine(tk, _, _, _) and
   result = tk.getLocation().getStartColumn()
   or
-  exists (RelevantToken prev |
+  exists(RelevantToken prev |
     prevTokenOnSameLine(tk, "if", prev, "else") or
-    prevTokenOnSameLine(tk, "else", prev, "}") |
+    prevTokenOnSameLine(tk, "else", prev, "}")
+  |
     result = semanticIndent(prev)
   )
 }
@@ -64,24 +61,23 @@ int semanticIndent(RelevantToken tk) {
 /**
  * Gets the semantic indentation of the `if` token of statement `i`.
  */
-int ifIndent(IfStmt i) {
-  result = semanticIndent(i.getIfToken())
-}
+int ifIndent(IfStmt i) { result = semanticIndent(i.getIfToken()) }
 
 /**
  * Gets the semantic indentation of the `else` token of statement `i`,
  * if any.
  */
-int elseIndent(IfStmt i) {
-  result = semanticIndent(i.getElseToken())
-}
+int elseIndent(IfStmt i) { result = semanticIndent(i.getElseToken()) }
 
 from IfStmt outer, IfStmt inner, Token outerIf, Token innerIf, Token innerElse, int outerIndent
-where inner = outer.getThen().getAChildStmt*() and
-      outerIf = outer.getIfToken() and outerIndent = ifIndent(outer) and
-      innerIf = inner.getIfToken() and innerElse = inner.getElseToken() and
-      outerIndent < ifIndent(inner) and
-      outerIndent = elseIndent(inner) and
-      not outer.getTopLevel().isMinified()
+where
+  inner = outer.getThen().getAChildStmt*() and
+  outerIf = outer.getIfToken() and
+  outerIndent = ifIndent(outer) and
+  innerIf = inner.getIfToken() and
+  innerElse = inner.getElseToken() and
+  outerIndent < ifIndent(inner) and
+  outerIndent = elseIndent(inner) and
+  not outer.getTopLevel().isMinified()
 select innerElse, "This else branch belongs to $@, but its indentation suggests it belongs to $@.",
-                innerIf, "this if statement", outerIf, "this other if statement"
\ No newline at end of file
+  innerIf, "this if statement", outerIf, "this other if statement"
diff --git a/javascript/ql/src/Statements/EphemeralLoop.ql b/javascript/ql/src/Statements/EphemeralLoop.ql
index 5d626a65ffb9..e99f0a64ed23 100644
--- a/javascript/ql/src/Statements/EphemeralLoop.ql
+++ b/javascript/ql/src/Statements/EphemeralLoop.ql
@@ -14,9 +14,10 @@ import semmle.javascript.RestrictedLocations
 import semmle.javascript.frameworks.Emscripten
 
 from LoopStmt l, BasicBlock body
-where body = l.getBody().getBasicBlock() and
-      not body.getASuccessor+() = body and
-      not l instanceof EnhancedForLoop and
-      // Emscripten generates lots of `do { ... } while(0);` loops, so exclude
-      not l.getTopLevel() instanceof EmscriptenGeneratedToplevel
-select (FirstLineOf)l, "This loop executes at most once."
\ No newline at end of file
+where
+  body = l.getBody().getBasicBlock() and
+  not body.getASuccessor+() = body and
+  not l instanceof EnhancedForLoop and
+  // Emscripten generates lots of `do { ... } while(0);` loops, so exclude
+  not l.getTopLevel() instanceof EmscriptenGeneratedToplevel
+select l.(FirstLineOf), "This loop executes at most once."
diff --git a/javascript/ql/src/Statements/ImplicitReturn.ql b/javascript/ql/src/Statements/ImplicitReturn.ql
index e6f964344694..bf187c205c5f 100644
--- a/javascript/ql/src/Statements/ImplicitReturn.ql
+++ b/javascript/ql/src/Statements/ImplicitReturn.ql
@@ -26,22 +26,21 @@ predicate isThrowOrReturn(Stmt s) {
 /**
  * A `return` statement with an operand (that is, not just `return;`).
  */
-class ValueReturn extends ReturnStmt {
-  ValueReturn() { exists(getExpr()) }
-}
+class ValueReturn extends ReturnStmt { ValueReturn() { exists(getExpr()) } }
 
 /** Gets the lexically first explicit return statement in function `f`. */
 ValueReturn getFirstExplicitReturn(Function f) {
   result = min(ValueReturn ret |
-    ret.getContainer() = f |
-    ret order by ret.getLocation().getStartLine(), ret.getLocation().getStartColumn()
-  )
+      ret.getContainer() = f
+    |
+      ret
+      order by
+        ret.getLocation().getStartLine(), ret.getLocation().getStartColumn()
+    )
 }
 
 /** Gets the number of return statements in function `f`, assuming there is at least one. */
-int numRet(Function f) {
-  result = strictcount(ReturnStmt ret | ret.getContainer() = f)
-}
+int numRet(Function f) { result = strictcount(ReturnStmt ret | ret.getContainer() = f) }
 
 /**
  * Holds if `f` is a dual-use constructor, that is, is a function that is meant to be invoked
@@ -55,7 +54,7 @@ int numRet(Function f) {
  */
 predicate isDualUseConstructor(Function f) {
   numRet(f) = 1 and
-  exists (ReturnStmt ret, DataFlow::NewNode new | ret.getContainer() = f |
+  exists(ReturnStmt ret, DataFlow::NewNode new | ret.getContainer() = f |
     new.asExpr() = ret.getExpr().getUnderlyingValue() and
     new.getACallee() = f
   )
@@ -67,7 +66,7 @@ predicate isDualUseConstructor(Function f) {
  * and isn't contained in a `finally` block.
  */
 Stmt getAFallThroughStmt(Function f) {
-  exists (ReachableBasicBlock bb, ControlFlowNode nd |
+  exists(ReachableBasicBlock bb, ControlFlowNode nd |
     bb.getANode() = nd and
     nd.isAFinalNode() and
     f = bb.getContainer() and
@@ -78,10 +77,12 @@ Stmt getAFallThroughStmt(Function f) {
 }
 
 from Function f, Stmt fallthrough
-where fallthrough = getAFallThroughStmt(f) and
-      // no control path ends with an implicit return statement of the form `return;`
-      not exists(ReturnStmt ret | ret.getContainer() = f and not exists(ret.getExpr())) and
-      // f doesn't look like a dual-use constructor (which otherwise would trigger a violation)
-      not isDualUseConstructor(f)
-select (FirstLineOf)fallthrough, "$@ may implicitly return 'undefined' here, while $@ an explicit value is returned.",
-                    f, capitalize(f.describe()), getFirstExplicitReturn(f), "elsewhere"
+where
+  fallthrough = getAFallThroughStmt(f) and
+  // no control path ends with an implicit return statement of the form `return;`
+  not exists(ReturnStmt ret | ret.getContainer() = f and not exists(ret.getExpr())) and
+  // f doesn't look like a dual-use constructor (which otherwise would trigger a violation)
+  not isDualUseConstructor(f)
+select fallthrough.(FirstLineOf),
+  "$@ may implicitly return 'undefined' here, while $@ an explicit value is returned.", f,
+  capitalize(f.describe()), getFirstExplicitReturn(f), "elsewhere"
diff --git a/javascript/ql/src/Statements/InconsistentLoopOrientation.ql b/javascript/ql/src/Statements/InconsistentLoopOrientation.ql
index 0a6dced5e8e5..7692a9d3d201 100644
--- a/javascript/ql/src/Statements/InconsistentLoopOrientation.ql
+++ b/javascript/ql/src/Statements/InconsistentLoopOrientation.ql
@@ -23,7 +23,8 @@ import javascript
  * downward.
  */
 predicate bounds(RelationalComparison test, Variable v, string direction) {
-  test.getLesserOperand() = v.getAnAccess() and direction = "upward" or
+  test.getLesserOperand() = v.getAnAccess() and direction = "upward"
+  or
   test.getGreaterOperand() = v.getAnAccess() and direction = "downward"
 }
 
@@ -36,12 +37,16 @@ predicate bounds(RelationalComparison test, Variable v, string direction) {
  */
 predicate updates(UpdateExpr upd, Variable v, string direction) {
   upd.getOperand() = v.getAnAccess() and
-  (upd instanceof IncExpr and direction = "upward" or
-   upd instanceof DecExpr and direction = "downward")
+  (
+    upd instanceof IncExpr and direction = "upward"
+    or
+    upd instanceof DecExpr and direction = "downward"
+  )
 }
 
 from ForStmt l, Variable v, string d1, string d2
-where bounds(l.getTest(), v, d1) and
-      updates(l.getUpdate(), v, d2) and
-      d1 != d2
+where
+  bounds(l.getTest(), v, d1) and
+  updates(l.getUpdate(), v, d2) and
+  d1 != d2
 select l, "This loop counts " + d2 + ", but its variable is bounded " + d1 + "."
diff --git a/javascript/ql/src/Statements/InconsistentReturn.ql b/javascript/ql/src/Statements/InconsistentReturn.ql
index 02d304bc8b17..b6978301e023 100644
--- a/javascript/ql/src/Statements/InconsistentReturn.ql
+++ b/javascript/ql/src/Statements/InconsistentReturn.ql
@@ -12,9 +12,11 @@
 import javascript
 
 from Function f, ReturnStmt explicit, ReturnStmt implicit
-where explicit.getContainer() = f and
-      implicit.getContainer() = f and
-      exists(explicit.getExpr()) and
-      not exists(implicit.getExpr())
-select implicit, "This return statement implicitly returns 'undefined', whereas $@ returns an explicit value.",
-                 explicit, "another return statement in the same function"
\ No newline at end of file
+where
+  explicit.getContainer() = f and
+  implicit.getContainer() = f and
+  exists(explicit.getExpr()) and
+  not exists(implicit.getExpr())
+select implicit,
+  "This return statement implicitly returns 'undefined', whereas $@ returns an explicit value.",
+  explicit, "another return statement in the same function"
diff --git a/javascript/ql/src/Statements/LabelInCase.ql b/javascript/ql/src/Statements/LabelInCase.ql
index 3a933f4c871a..e88d366136f6 100644
--- a/javascript/ql/src/Statements/LabelInCase.ql
+++ b/javascript/ql/src/Statements/LabelInCase.ql
@@ -13,6 +13,7 @@
 import javascript
 
 from LabeledStmt l, Case c
-where l = c.getAChildStmt+() and
-      l.getLocation().getStartColumn() = c.getLocation().getStartColumn()
-select l.getChildExpr(0), "Non-case labels in switch statements are confusing."
\ No newline at end of file
+where
+  l = c.getAChildStmt+() and
+  l.getLocation().getStartColumn() = c.getLocation().getStartColumn()
+select l.getChildExpr(0), "Non-case labels in switch statements are confusing."
diff --git a/javascript/ql/src/Statements/LoopIterationSkippedDueToShifting.ql b/javascript/ql/src/Statements/LoopIterationSkippedDueToShifting.ql
index bbaca72234e2..dc79821e4e68 100644
--- a/javascript/ql/src/Statements/LoopIterationSkippedDueToShifting.ql
+++ b/javascript/ql/src/Statements/LoopIterationSkippedDueToShifting.ql
@@ -1,13 +1,14 @@
 /**
  * @name Loop iteration skipped due to shifting
  * @description Removing elements from an array while iterating over it can cause the loop to skip over some elements,
- *              unless the loop index is decremented accordingly. 
+ *              unless the loop index is decremented accordingly.
  * @kind problem
  * @problem.severity warning
  * @id js/loop-iteration-skipped-due-to-shifting
  * @tags correctness
  * @precision high
  */
+
 import javascript
 
 /**
@@ -24,25 +25,19 @@ class ArrayShiftingCall extends DataFlow::MethodCallNode {
     (name = "splice" or name = "shift" or name = "unshift")
   }
 
-  DataFlow::SourceNode getArray() {
-    result = getReceiver().getALocalSource()
-  }
+  DataFlow::SourceNode getArray() { result = getReceiver().getALocalSource() }
 }
 
 /**
  * A call to `splice` on an array.
  */
 class SpliceCall extends ArrayShiftingCall {
-  SpliceCall() {
-    name = "splice"
-  }
+  SpliceCall() { name = "splice" }
 
   /**
    * Gets the index from which elements are removed and possibly new elemenst are inserted.
    */
-  DataFlow::Node getIndex() {
-    result = getArgument(0)
-  }
+  DataFlow::Node getIndex() { result = getArgument(0) }
 
   /**
    * Gets the number of removed elements.
@@ -66,21 +61,21 @@ class SpliceCall extends ArrayShiftingCall {
  */
 class ArrayIterationLoop extends ForStmt {
   DataFlow::SourceNode array;
+
   LocalVariable indexVariable;
-  
+
   ArrayIterationLoop() {
-    exists (RelationalComparison compare | compare = getTest() |
+    exists(RelationalComparison compare | compare = getTest() |
       compare.getLesserOperand() = indexVariable.getAnAccess() and
-      compare.getGreaterOperand() = array.getAPropertyRead("length").asExpr()) and
+      compare.getGreaterOperand() = array.getAPropertyRead("length").asExpr()
+    ) and
     getUpdate().(IncExpr).getOperand() = indexVariable.getAnAccess()
   }
 
   /**
    * Gets the variable holding the loop variable and current array index.
    */
-  LocalVariable getIndexVariable() {
-    result = indexVariable
-  }
+  LocalVariable getIndexVariable() { result = indexVariable }
 
   /**
    * Gets the loop entry point.
@@ -92,12 +87,10 @@ class ArrayIterationLoop extends ForStmt {
   /**
    * Gets a call that potentially shifts the elements of the given array.
    */
-  ArrayShiftingCall getAnArrayShiftingCall() {
-    result.getArray() = array
-  }
+  ArrayShiftingCall getAnArrayShiftingCall() { result.getArray() = array }
 
   /**
-   * Gets a call to `splice` that removes elements from the looped-over array at the current index 
+   * Gets a call to `splice` that removes elements from the looped-over array at the current index
    *
    * The `splice` call is not guaranteed to be inside the loop body.
    */
@@ -126,21 +119,21 @@ class ArrayIterationLoop extends ForStmt {
     hasPathTo(cfg.getAPredecessor()) and
     getLoopEntry().dominates(cfg.getBasicBlock()) and
     not hasIndexingManipulation(cfg) and
-
     // Ignore splice calls guarded by an index equality check.
     // This indicates that the index of an element is the basis for removal, not its value,
     // which means it may be okay to skip over elements.
-    not exists (ConditionGuardNode guard, EqualityTest test | cfg = guard |
+    not exists(ConditionGuardNode guard, EqualityTest test | cfg = guard |
       test = guard.getTest() and
       test.getAnOperand() = getIndexVariable().getAnAccess() and
-      guard.getOutcome() = test.getPolarity()) and
-
+      guard.getOutcome() = test.getPolarity()
+    ) and
     // Block flow after inspecting an array element other than that at the current index.
     // For example, if the splice happens after inspecting `array[i + 1]`, then the next
     // element has already been "looked at" and so it doesn't matter if we skip it.
-    not exists (IndexExpr index | cfg = index |
+    not exists(IndexExpr index | cfg = index |
       array.flowsToExpr(index.getBase()) and
-      not index.getIndex() = getIndexVariable().getAnAccess())
+      not index.getIndex() = getIndexVariable().getAnAccess()
+    )
   }
 
   /**
@@ -160,4 +153,6 @@ class ArrayIterationLoop extends ForStmt {
 
 from ArrayIterationLoop loop, SpliceCall splice
 where loop.hasPathThrough(splice, loop.getUpdate().getFirstControlFlowNode())
-select splice, "Removing an array item without adjusting the loop index '" + loop.getIndexVariable().getName() + "' causes the subsequent array item to be skipped."
+select splice,
+  "Removing an array item without adjusting the loop index '" + loop.getIndexVariable().getName() +
+    "' causes the subsequent array item to be skipped."
diff --git a/javascript/ql/src/Statements/MisleadingIndentationAfterControlStmt.ql b/javascript/ql/src/Statements/MisleadingIndentationAfterControlStmt.ql
index 0629224ed503..91ee1bd4c005 100644
--- a/javascript/ql/src/Statements/MisleadingIndentationAfterControlStmt.ql
+++ b/javascript/ql/src/Statements/MisleadingIndentationAfterControlStmt.ql
@@ -26,19 +26,22 @@ predicate misleadingIndentationCandidate(ControlStmt ctrl, Stmt s1, Stmt s2) {
   not s2 = ctrl.getAControlledStmt()
 }
 
-from ControlStmt ctrl, Stmt s1, Stmt s2, string indent, int ctrlStartColumn, int startColumn,
-     File f, int ctrlStartLine, int startLine1, int startLine2
-where misleadingIndentationCandidate(ctrl, s1, s2) and
-      ctrl.getLocation().hasLocationInfo(f.getAbsolutePath(), ctrlStartLine, ctrlStartColumn, _, _) and
-      // `s1` and `s2` are indented the same
-      s1.getLocation().hasLocationInfo(f.getAbsolutePath(), startLine1, startColumn, _, _) and
-      s2.getLocation().hasLocationInfo(f.getAbsolutePath(), startLine2, startColumn, _, _) and
-      // `s1` is indented relative to `ctrl`
-      startColumn > ctrlStartColumn and
-      // `ctrl`, `s1` and `s2` all have the same indentation character
-      f.hasIndentation(ctrlStartLine, indent, _) and
-      f.hasIndentation(startLine1, indent, _) and
-      f.hasIndentation(startLine2, indent, _) and
-      not s2 instanceof EmptyStmt
-select (FirstLineOf)s2, "The indentation of this statement suggests that it is controlled by $@, while in fact it is not.",
-            (FirstLineOf)ctrl, "this statement"
\ No newline at end of file
+from
+  ControlStmt ctrl, Stmt s1, Stmt s2, string indent, int ctrlStartColumn, int startColumn, File f,
+  int ctrlStartLine, int startLine1, int startLine2
+where
+  misleadingIndentationCandidate(ctrl, s1, s2) and
+  ctrl.getLocation().hasLocationInfo(f.getAbsolutePath(), ctrlStartLine, ctrlStartColumn, _, _) and
+  // `s1` and `s2` are indented the same
+  s1.getLocation().hasLocationInfo(f.getAbsolutePath(), startLine1, startColumn, _, _) and
+  s2.getLocation().hasLocationInfo(f.getAbsolutePath(), startLine2, startColumn, _, _) and
+  // `s1` is indented relative to `ctrl`
+  startColumn > ctrlStartColumn and
+  // `ctrl`, `s1` and `s2` all have the same indentation character
+  f.hasIndentation(ctrlStartLine, indent, _) and
+  f.hasIndentation(startLine1, indent, _) and
+  f.hasIndentation(startLine2, indent, _) and
+  not s2 instanceof EmptyStmt
+select s2.(FirstLineOf),
+  "The indentation of this statement suggests that it is controlled by $@, while in fact it is not.",
+  ctrl.(FirstLineOf), "this statement"
diff --git a/javascript/ql/src/Statements/NestedLoopsSameVariable.ql b/javascript/ql/src/Statements/NestedLoopsSameVariable.ql
index 408aed0225fa..7288415b903b 100644
--- a/javascript/ql/src/Statements/NestedLoopsSameVariable.ql
+++ b/javascript/ql/src/Statements/NestedLoopsSameVariable.ql
@@ -16,12 +16,15 @@ import javascript
  * Gets an iteration variable that loop `for` tests and updates.
  */
 Variable getAnIterationVariable(ForStmt for) {
-    result.getAnAccess().getParentExpr*() = for.getTest() and
-    exists (UpdateExpr upd | upd.getParentExpr*() = for.getUpdate() | upd.getOperand() = result.getAnAccess())
+  result.getAnAccess().getParentExpr*() = for.getTest() and
+  exists(UpdateExpr upd | upd.getParentExpr*() = for.getUpdate() |
+    upd.getOperand() = result.getAnAccess()
+  )
 }
 
 from ForStmt outer, ForStmt inner
-where inner.nestedIn(outer) and
-      getAnIterationVariable(outer) = getAnIterationVariable(inner)
-select inner.getTest(), "This for statement uses the same loop variable as an enclosing $@.",
-                        outer, "for statement"
+where
+  inner.nestedIn(outer) and
+  getAnIterationVariable(outer) = getAnIterationVariable(inner)
+select inner.getTest(), "This for statement uses the same loop variable as an enclosing $@.", outer,
+  "for statement"
diff --git a/javascript/ql/src/Statements/ReturnAssignsLocal.ql b/javascript/ql/src/Statements/ReturnAssignsLocal.ql
index 0a84062c1eff..6d0c79913c27 100644
--- a/javascript/ql/src/Statements/ReturnAssignsLocal.ql
+++ b/javascript/ql/src/Statements/ReturnAssignsLocal.ql
@@ -15,8 +15,11 @@ import javascript
 import semmle.javascript.RestrictedLocations
 
 from ReturnStmt r, AssignExpr assgn, Variable v
-where assgn = r.getExpr().stripParens() and
-      v = ((Function)r.getContainer()).getScope().getAVariable() and
-      not v.isCaptured() and
-      assgn.getLhs() = v.getAnAccess()
-select (FirstLineOf)r, "The assignment to " + v.getName() + " is useless, since it is a local variable and will go out of scope."
\ No newline at end of file
+where
+  assgn = r.getExpr().stripParens() and
+  v = (r.getContainer().(Function)).getScope().getAVariable() and
+  not v.isCaptured() and
+  assgn.getLhs() = v.getAnAccess()
+select r.(FirstLineOf),
+  "The assignment to " + v.getName() +
+    " is useless, since it is a local variable and will go out of scope."
diff --git a/javascript/ql/src/Statements/ReturnOutsideFunction.ql b/javascript/ql/src/Statements/ReturnOutsideFunction.ql
index 05c2ba559142..0cbdbe5ac350 100644
--- a/javascript/ql/src/Statements/ReturnOutsideFunction.ql
+++ b/javascript/ql/src/Statements/ReturnOutsideFunction.ql
@@ -14,7 +14,8 @@ import javascript
 import semmle.javascript.RestrictedLocations
 
 from ReturnStmt ret, TopLevel tl
-where tl = ret.getContainer() and
-      not tl instanceof EventHandlerCode and
-      not tl instanceof NodeModule
-select (FirstLineOf)ret, "Return statement outside function."
\ No newline at end of file
+where
+  tl = ret.getContainer() and
+  not tl instanceof EventHandlerCode and
+  not tl instanceof NodeModule
+select ret.(FirstLineOf), "Return statement outside function."
diff --git a/javascript/ql/src/Statements/SuspiciousUnusedLoopIterationVariable.ql b/javascript/ql/src/Statements/SuspiciousUnusedLoopIterationVariable.ql
index 0936cbc30f66..1fd2faba582c 100644
--- a/javascript/ql/src/Statements/SuspiciousUnusedLoopIterationVariable.ql
+++ b/javascript/ql/src/Statements/SuspiciousUnusedLoopIterationVariable.ql
@@ -20,11 +20,15 @@ import javascript
 class IncrementExpr extends Expr {
   IncrementExpr() {
     // x += e
-    this instanceof AssignAddExpr or
+    this instanceof AssignAddExpr
+    or
     // ++x or x++
-    this instanceof PreIncExpr or this instanceof PostIncExpr or
+    this instanceof PreIncExpr
+    or
+    this instanceof PostIncExpr
+    or
     // x = x + e
-    exists (AssignExpr assgn, Variable v | assgn = this |
+    exists(AssignExpr assgn, Variable v | assgn = this |
       assgn.getTarget() = v.getAnAccess() and
       assgn.getRhs().(AddExpr).getAnOperand().getUnderlyingReference() = v.getAnAccess()
     )
@@ -35,18 +39,17 @@ class IncrementExpr extends Expr {
  * Holds if `efl` is a loop whose body increments a variable and does nothing else.
  */
 predicate countingLoop(EnhancedForLoop efl) {
-  exists (ExprStmt inc | inc.getExpr().stripParens() instanceof IncrementExpr |
+  exists(ExprStmt inc | inc.getExpr().stripParens() instanceof IncrementExpr |
     inc = efl.getBody() or
     inc = efl.getBody().(BlockStmt).getAStmt()
   )
 }
 
 from EnhancedForLoop efl, PurelyLocalVariable iter
-where iter = efl.getAnIterationVariable() and
-      not exists (SsaExplicitDefinition ssa | ssa.defines(efl.getIteratorExpr(), iter)) and
-      exists (ReachableBasicBlock body | body.getANode() = efl.getBody() |
-        body.getASuccessor+() = body
-      ) and
-      not countingLoop(efl) and
-      not iter.getName().toLowerCase().regexpMatch("(_|dummy|unused).*")
-select efl.getIterator(), "For loop variable " + iter.getName() + " is not used in the loop body."
\ No newline at end of file
+where
+  iter = efl.getAnIterationVariable() and
+  not exists(SsaExplicitDefinition ssa | ssa.defines(efl.getIteratorExpr(), iter)) and
+  exists(ReachableBasicBlock body | body.getANode() = efl.getBody() | body.getASuccessor+() = body) and
+  not countingLoop(efl) and
+  not iter.getName().toLowerCase().regexpMatch("(_|dummy|unused).*")
+select efl.getIterator(), "For loop variable " + iter.getName() + " is not used in the loop body."
diff --git a/javascript/ql/src/Statements/UnreachableStatement.ql b/javascript/ql/src/Statements/UnreachableStatement.ql
index 04a7a4d3496a..9793f22aea85 100644
--- a/javascript/ql/src/Statements/UnreachableStatement.ql
+++ b/javascript/ql/src/Statements/UnreachableStatement.ql
@@ -14,16 +14,17 @@ import javascript
 import semmle.javascript.RestrictedLocations
 
 from Stmt s
-where // `s` is unreachable in the CFG
-      s.getFirstControlFlowNode().isUnreachable() and
-      // the CFG does not model all possible exceptional control flow, so be conservative about catch clauses
-      not s instanceof CatchClause and
-      // function declarations are special and always reachable
-      not s instanceof FunctionDeclStmt and
-      // allow a spurious 'break' statement at the end of a switch-case
-      not exists(Case c, int i | i = c.getNumBodyStmt() | (BreakStmt)s = c.getBodyStmt(i-1)) and
-      // ignore ambient statements
-      not s.isAmbient() and
-      // ignore empty statements
-      not s instanceof EmptyStmt
-select (FirstLineOf)s, "This statement is unreachable."
\ No newline at end of file
+where
+  // `s` is unreachable in the CFG
+  s.getFirstControlFlowNode().isUnreachable() and
+  // the CFG does not model all possible exceptional control flow, so be conservative about catch clauses
+  not s instanceof CatchClause and
+  // function declarations are special and always reachable
+  not s instanceof FunctionDeclStmt and
+  // allow a spurious 'break' statement at the end of a switch-case
+  not exists(Case c, int i | i = c.getNumBodyStmt() | s.(BreakStmt) = c.getBodyStmt(i - 1)) and
+  // ignore ambient statements
+  not s.isAmbient() and
+  // ignore empty statements
+  not s instanceof EmptyStmt
+select s.(FirstLineOf), "This statement is unreachable."
diff --git a/javascript/ql/src/Statements/UselessComparisonTest.ql b/javascript/ql/src/Statements/UselessComparisonTest.ql
index 419f02a000c3..6066d7c4329b 100644
--- a/javascript/ql/src/Statements/UselessComparisonTest.ql
+++ b/javascript/ql/src/Statements/UselessComparisonTest.ql
@@ -17,18 +17,20 @@ import javascript
  * We use this to restrict reachability analysis to a small set of containers.
  */
 predicate hasContradictoryGuardNodes(StmtContainer container) {
-  exists (ConditionGuardNode guard |
+  exists(ConditionGuardNode guard |
     RangeAnalysis::isContradictoryGuardNode(guard) and
-    container = guard.getContainer())
+    container = guard.getContainer()
+  )
 }
 
 /**
  * Holds if `block` is reachable and is in a container with contradictory guard nodes.
  */
 predicate isReachable(BasicBlock block) {
-  exists (StmtContainer container |
+  exists(StmtContainer container |
     hasContradictoryGuardNodes(container) and
-    block = container.getEntryBB())
+    block = container.getEntryBB()
+  )
   or
   isReachable(block.getAPredecessor()) and
   not RangeAnalysis::isContradictoryGuardNode(block.getANode())
@@ -50,11 +52,13 @@ predicate isBlockedByContradictoryGuardNodes(BasicBlock block, ConditionGuardNod
  * Holds if the given guard node is contradictory and causes an expression or statement to be unreachable.
  */
 predicate isGuardNodeWithDeadCode(ConditionGuardNode guard) {
-  exists (BasicBlock block |
+  exists(BasicBlock block |
     isBlockedByContradictoryGuardNodes(block, guard) and
-    block.getANode() instanceof ExprOrStmt)
+    block.getANode() instanceof ExprOrStmt
+  )
 }
 
 from ConditionGuardNode guard
 where isGuardNodeWithDeadCode(guard)
-select guard.getTest(), "The condition '" + guard.getTest() + "' is always " + guard.getOutcome().booleanNot() + "."
+select guard.getTest(),
+  "The condition '" + guard.getTest() + "' is always " + guard.getOutcome().booleanNot() + "."
diff --git a/javascript/ql/src/Statements/UselessConditional.ql b/javascript/ql/src/Statements/UselessConditional.ql
index f5f92454c69c..e2994f0cb207 100644
--- a/javascript/ql/src/Statements/UselessConditional.ql
+++ b/javascript/ql/src/Statements/UselessConditional.ql
@@ -25,9 +25,9 @@ import semmle.javascript.DefensiveProgramming
  */
 predicate isSymbolicConstant(Variable v) {
   // defined exactly once
-  count (VarDef vd | vd.getAVariable() = v) = 1 and
+  count(VarDef vd | vd.getAVariable() = v) = 1 and
   // the definition is either a `const` declaration or it assigns a constant to it
-  exists (VarDef vd | vd.getAVariable() = v and count(vd.getAVariable()) = 1 |
+  exists(VarDef vd | vd.getAVariable() = v and count(vd.getAVariable()) = 1 |
     vd.(VariableDeclarator).getDeclStmt() instanceof ConstDeclStmt or
     isConstant(vd.getSource())
   )
@@ -46,7 +46,7 @@ predicate isConstant(Expr e) {
  */
 predicate isInitialParameterUse(Expr e) {
   // unlike `SimpleParameter.getAnInitialUse` this will not include uses we have refinement information for
-  exists (SimpleParameter p, SsaExplicitDefinition ssa |
+  exists(SimpleParameter p, SsaExplicitDefinition ssa |
     ssa.getDef() = p and
     ssa.getVariable().getAUse() = e and
     not p.isRestParameter()
@@ -60,11 +60,11 @@ predicate isInitialParameterUse(Expr e) {
  */
 predicate isConstantBooleanReturnValue(Expr e) {
   // unlike `SourceNode.flowsTo` this will not include uses we have refinement information for
-  exists (DataFlow::CallNode call |
-    exists (call.analyze().getTheBooleanValue()) |
-    e = call.asExpr() or
+  exists(DataFlow::CallNode call | exists(call.analyze().getTheBooleanValue()) |
+    e = call.asExpr()
+    or
     // also support return values that are assigned to variables
-    exists (SsaExplicitDefinition ssa |
+    exists(SsaExplicitDefinition ssa |
       ssa.getDef().getSource() = call.asExpr() and
       ssa.getVariable().getAUse() = e
     )
@@ -113,10 +113,14 @@ predicate whitelist(Expr e) {
  * is not used for anything other than this truthiness check.
  */
 predicate isExplicitConditional(ASTNode cond, Expr e) {
-  e = cond.(IfStmt).getCondition() or
-  e = cond.(LoopStmt).getTest() or
-  e = cond.(ConditionalExpr).getCondition() or
-  isExplicitConditional(_, cond) and e = cond.(Expr).getUnderlyingValue().(LogicalBinaryExpr).getAnOperand()
+  e = cond.(IfStmt).getCondition()
+  or
+  e = cond.(LoopStmt).getTest()
+  or
+  e = cond.(ConditionalExpr).getCondition()
+  or
+  isExplicitConditional(_, cond) and
+  e = cond.(Expr).getUnderlyingValue().(LogicalBinaryExpr).getAnOperand()
 }
 
 /**
@@ -132,19 +136,18 @@ predicate isConditional(ASTNode cond, Expr e) {
 }
 
 from ASTNode cond, DataFlow::AnalyzedNode op, boolean cv, ASTNode sel, string msg
-where isConditional(cond, op.asExpr()) and
-      cv = op.getTheBooleanValue()and
-      not whitelist(op.asExpr()) and
-
-      // if `cond` is of the form `<non-trivial truthy expr> && <something>`,
-      // we suggest replacing it with `<non-trivial truthy expr>, <something>`
-      if cond.(LogAndExpr).getLeftOperand() = op.asExpr() and cv = true and not op.asExpr().isPure() then
-        (sel = cond and msg = "This logical 'and' expression can be replaced with a comma expression.")
-
-      // otherwise we just report that `op` always evaluates to `cv`
-      else (
-        sel = op.asExpr().stripParens() and
-        msg = "This " + describeExpression(sel) + " always evaluates to " + cv + "."
-      )
-
+where
+  isConditional(cond, op.asExpr()) and
+  cv = op.getTheBooleanValue() and
+  not whitelist(op.asExpr()) and
+  // if `cond` is of the form `<non-trivial truthy expr> && <something>`,
+  // we suggest replacing it with `<non-trivial truthy expr>, <something>`
+  if cond.(LogAndExpr).getLeftOperand() = op.asExpr() and cv = true and not op.asExpr().isPure()
+  then (
+    sel = cond and msg = "This logical 'and' expression can be replaced with a comma expression."
+  ) else (
+    // otherwise we just report that `op` always evaluates to `cv`
+    sel = op.asExpr().stripParens() and
+    msg = "This " + describeExpression(sel) + " always evaluates to " + cv + "."
+  )
 select sel, msg
diff --git a/javascript/ql/src/definitions.ql b/javascript/ql/src/definitions.ql
index a31bf79d4bad..ff97699d0aeb 100644
--- a/javascript/ql/src/definitions.ql
+++ b/javascript/ql/src/definitions.ql
@@ -19,17 +19,16 @@ private import Declarations.Declarations
  * `x` has kind `"V"`.
  */
 string refKind(RefExpr r) {
-  if exists(InvokeExpr invk | r = invk.getCallee().getUnderlyingReference()) then
-    result = "M"
-  else
-    result = "V"
+  if exists(InvokeExpr invk | r = invk.getCallee().getUnderlyingReference())
+  then result = "M"
+  else result = "V"
 }
 
 /**
  * Gets a class, function or object literal `va` may refer to.
  */
 ASTNode lookupDef(VarAccess va) {
-  exists (AbstractValue av | av = va.analyze().getAValue() |
+  exists(AbstractValue av | av = va.analyze().getAValue() |
     result = av.(AbstractClass).getClass() or
     result = av.(AbstractFunction).getFunction() or
     result = av.(AbstractObjectLiteral).getObjectExpr()
@@ -72,15 +71,15 @@ predicate variableDeclLookup(VarAccess va, VarDecl decl, string kind) {
 predicate importLookup(PathExpr path, Module target, string kind) {
   kind = "I" and
   (
-   exists (Import i |
-     path = i.getImportedPath() and
-     target = i.getImportedModule()
-   )
-   or
-   exists (ReExportDeclaration red |
-     path = red.getImportedPath() and
-     target = red.getImportedModule()
-   )
+    exists(Import i |
+      path = i.getImportedPath() and
+      target = i.getImportedModule()
+    )
+    or
+    exists(ReExportDeclaration red |
+      path = red.getImportedPath() and
+      target = red.getImportedModule()
+    )
   )
 }
 
@@ -88,18 +87,20 @@ predicate importLookup(PathExpr path, Module target, string kind) {
  * Gets a node that may write the property read by `prn`.
  */
 ASTNode getAWrite(DataFlow::PropRead prn) {
-  exists (DataFlow::AnalyzedNode base, DefiniteAbstractValue baseVal, string propName |
-    base = prn.getBase() and propName = prn.getPropertyName() and
-    baseVal = base.getAValue().getAPrototype*() |
+  exists(DataFlow::AnalyzedNode base, DefiniteAbstractValue baseVal, string propName |
+    base = prn.getBase() and
+    propName = prn.getPropertyName() and
+    baseVal = base.getAValue().getAPrototype*()
+  |
     // write to a property on baseVal
-    exists (AnalyzedPropertyWrite apw |
+    exists(AnalyzedPropertyWrite apw |
       result = apw.getAstNode() and
       apw.writes(baseVal, propName, _)
     )
     or
     // non-static class members aren't covered by `AnalyzedPropWrite`, so have to be handled
     // separately
-    exists (ClassDefinition c, MemberDefinition m |
+    exists(ClassDefinition c, MemberDefinition m |
       m = c.getMember(propName) and
       baseVal.(AbstractInstance).getConstructor().(AbstractClass).getClass() = c and
       result = m.getNameExpr()
@@ -114,7 +115,7 @@ ASTNode getAWrite(DataFlow::PropRead prn) {
  * at the moment.
  */
 predicate propertyLookup(Expr prop, ASTNode write, string kind) {
-  exists (DataFlow::PropRead prn | prop = prn.getPropertyNameExpr() |
+  exists(DataFlow::PropRead prn | prop = prn.getPropertyNameExpr() |
     count(getAWrite(prn)) = 1 and
     write = getAWrite(prn) and
     kind = "M"
@@ -125,15 +126,17 @@ predicate propertyLookup(Expr prop, ASTNode write, string kind) {
  * Holds if `ref` is an identifier that refers to a type or namespace declared at `decl`.
  */
 predicate typeLookup(ASTNode ref, ASTNode decl, string kind) {
-  exists (TypeAccess typeAccess |
+  exists(TypeAccess typeAccess |
     ref = typeAccess.getIdentifier() and
     decl = typeAccess.getTypeName().getADefinition() and
-    kind = "T")
+    kind = "T"
+  )
   or
-  exists (NamespaceAccess namespaceAccess |
+  exists(NamespaceAccess namespaceAccess |
     ref = namespaceAccess.getIdentifier() and
     decl = namespaceAccess.getNamespace().getADefinition() and
-    kind = "T")
+    kind = "T"
+  )
 }
 
 /**
@@ -142,19 +145,26 @@ predicate typeLookup(ASTNode ref, ASTNode decl, string kind) {
 predicate typedInvokeLookup(ASTNode ref, ASTNode decl, string kind) {
   not variableDefLookup(ref, decl, _) and
   not propertyLookup(ref, decl, _) and
-  exists (InvokeExpr invoke, Expr callee | 
+  exists(InvokeExpr invoke, Expr callee |
     callee = invoke.getCallee().getUnderlyingReference() and
     (ref = callee.(Identifier) or ref = callee.(DotExpr).getPropertyNameExpr()) and
     decl = invoke.getResolvedCallee() and
-    kind = "M")
+    kind = "M"
+  )
 }
 
 from ASTNode ref, ASTNode decl, string kind
-where variableDefLookup(ref, decl, kind) or
-      // prefer definitions over declarations
-      not variableDefLookup(ref, _, _) and variableDeclLookup(ref, decl, kind) or
-      importLookup(ref, decl, kind) or
-      propertyLookup(ref, decl, kind) or
-      typeLookup(ref, decl, kind) or
-      typedInvokeLookup(ref, decl, kind)
+where
+  variableDefLookup(ref, decl, kind)
+  or
+  // prefer definitions over declarations
+  not variableDefLookup(ref, _, _) and variableDeclLookup(ref, decl, kind)
+  or
+  importLookup(ref, decl, kind)
+  or
+  propertyLookup(ref, decl, kind)
+  or
+  typeLookup(ref, decl, kind)
+  or
+  typedInvokeLookup(ref, decl, kind)
 select ref, decl, kind
diff --git a/javascript/ql/src/filters/ClassifyFiles.ql b/javascript/ql/src/filters/ClassifyFiles.ql
index 70b8f635e4a6..b60b5b8f2ef8 100644
--- a/javascript/ql/src/filters/ClassifyFiles.ql
+++ b/javascript/ql/src/filters/ClassifyFiles.ql
@@ -20,14 +20,13 @@ import semmle.javascript.dependencies.FrameworkLibraries
  * `templates`.
  */
 predicate maybeCausedByTemplate(JSParseError e) {
-  exists (File f | f = e.getFile() |
+  exists(File f | f = e.getFile() |
     e.getLine().indexOf(Templating::getADelimiter()) <= e.getLocation().getStartColumn()
     or
     f.getAbsolutePath().regexpMatch("(?i).*\\btemplates?\\b.*")
   )
 }
 
-
 /**
  * Holds if `e` is an expression in the form `o.p1.p2.p3....pn`.
  */
@@ -40,9 +39,9 @@ private predicate isNestedDotExpr(DotExpr e) {
  * Holds if `tl` only contains variable declarations and field reads.
  */
 private predicate looksLikeExterns(TopLevel tl) {
-  forex (Stmt s | s.getParent() = tl |
-    exists (VarDeclStmt vds | vds = s |
-      forall (VariableDeclarator vd | vd = vds.getADecl() | not exists(vd.getInit()))
+  forex(Stmt s | s.getParent() = tl |
+    exists(VarDeclStmt vds | vds = s |
+      forall(VariableDeclarator vd | vd = vds.getADecl() | not exists(vd.getInit()))
     )
     or
     isNestedDotExpr(s.(ExprStmt).getExpr())
@@ -62,18 +61,19 @@ private predicate looksLikeExterns(TopLevel tl) {
 predicate classify(File f, string category) {
   isGenerated(f.getATopLevel()) and category = "generated"
   or
-  exists (Test t | t.getFile() = f | category = "test")
+  exists(Test t | t.getFile() = f | category = "test")
   or
-  (f.getATopLevel().isExterns() or looksLikeExterns(f.getATopLevel())) and category = "externs"
+  (f.getATopLevel().isExterns() or looksLikeExterns(f.getATopLevel())) and
+  category = "externs"
   or
   f.getATopLevel() instanceof FrameworkLibraryInstance and category = "library"
   or
-  exists (JSParseError err | maybeCausedByTemplate(err) |
+  exists(JSParseError err | maybeCausedByTemplate(err) |
     f = err.getFile() and category = "template"
   )
   or
   // Polymer templates
-  exists (HTML::Element elt | elt.getName() = "template" |
+  exists(HTML::Element elt | elt.getName() = "template" |
     f = elt.getFile() and category = "template"
   )
 }
diff --git a/javascript/ql/src/filters/FilterFrameworks.ql b/javascript/ql/src/filters/FilterFrameworks.ql
index 3e972c39d079..ba21a3f596bd 100644
--- a/javascript/ql/src/filters/FilterFrameworks.ql
+++ b/javascript/ql/src/filters/FilterFrameworks.ql
@@ -11,4 +11,4 @@ import external.DefectFilter
 
 from DefectResult defres
 where nonFrameworkFile(defres.getFile())
-select defres, defres.getMessage()
\ No newline at end of file
+select defres, defres.getMessage()
diff --git a/javascript/ql/src/filters/FilterFrameworks.qll b/javascript/ql/src/filters/FilterFrameworks.qll
index bdae00768431..d2e94305a949 100644
--- a/javascript/ql/src/filters/FilterFrameworks.qll
+++ b/javascript/ql/src/filters/FilterFrameworks.qll
@@ -3,6 +3,5 @@ import semmle.javascript.dependencies.FrameworkLibraries
 /**
  * Holds if file `f` does not contain a framework library.
  */
-pragma[nomagic] predicate nonFrameworkFile(File f) {
-  not exists (FrameworkLibraryInstance fl | fl.getFile() = f)
-}
+pragma[nomagic]
+predicate nonFrameworkFile(File f) { not exists(FrameworkLibraryInstance fl | fl.getFile() = f) }
diff --git a/javascript/ql/src/filters/FilterFrameworksForMetric.ql b/javascript/ql/src/filters/FilterFrameworksForMetric.ql
index e100255f516a..72916a263512 100644
--- a/javascript/ql/src/filters/FilterFrameworksForMetric.ql
+++ b/javascript/ql/src/filters/FilterFrameworksForMetric.ql
@@ -10,4 +10,4 @@ import external.MetricFilter
 
 from MetricResult res
 where nonFrameworkFile(res.getFile())
-select res, res.getValue()
\ No newline at end of file
+select res, res.getValue()
diff --git a/javascript/ql/src/filters/FilterGenerated.ql b/javascript/ql/src/filters/FilterGenerated.ql
index f1edfd6fc003..5fe34572f31a 100644
--- a/javascript/ql/src/filters/FilterGenerated.ql
+++ b/javascript/ql/src/filters/FilterGenerated.ql
@@ -12,4 +12,4 @@ import external.DefectFilter
 
 from DefectResult defres
 where not isGeneratedCode(defres.getFile())
-select defres, defres.getMessage()
\ No newline at end of file
+select defres, defres.getMessage()
diff --git a/javascript/ql/src/filters/FilterGeneratedForMetric.ql b/javascript/ql/src/filters/FilterGeneratedForMetric.ql
index 2a2dea78f4e2..89ba33dcda81 100644
--- a/javascript/ql/src/filters/FilterGeneratedForMetric.ql
+++ b/javascript/ql/src/filters/FilterGeneratedForMetric.ql
@@ -12,4 +12,4 @@ import external.MetricFilter
 
 from MetricResult res
 where not isGeneratedCode(res.getFile())
-select res, res.getValue()
\ No newline at end of file
+select res, res.getValue()
diff --git a/javascript/ql/src/filters/FilterMinified.ql b/javascript/ql/src/filters/FilterMinified.ql
index 768bbb942669..8eff17ba7dc6 100644
--- a/javascript/ql/src/filters/FilterMinified.ql
+++ b/javascript/ql/src/filters/FilterMinified.ql
@@ -10,4 +10,4 @@ import external.DefectFilter
 
 from DefectResult defres
 where not defres.getFile().getATopLevel().isMinified()
-select defres, defres.getMessage()
\ No newline at end of file
+select defres, defres.getMessage()
diff --git a/javascript/ql/src/filters/FilterMinifiedForMetric.ql b/javascript/ql/src/filters/FilterMinifiedForMetric.ql
index 3f87daea6dd1..e209fb0ee3ed 100644
--- a/javascript/ql/src/filters/FilterMinifiedForMetric.ql
+++ b/javascript/ql/src/filters/FilterMinifiedForMetric.ql
@@ -10,4 +10,4 @@ import external.MetricFilter
 
 from MetricResult res
 where not res.getFile().getATopLevel().isMinified()
-select res, res.getValue()
\ No newline at end of file
+select res, res.getValue()
diff --git a/javascript/ql/src/semmle/javascript/AMD.qll b/javascript/ql/src/semmle/javascript/AMD.qll
index ff2c27d51e80..c66d460c7ebd 100644
--- a/javascript/ql/src/semmle/javascript/AMD.qll
+++ b/javascript/ql/src/semmle/javascript/AMD.qll
@@ -27,9 +27,11 @@ class AMDModuleDefinition extends CallExpr {
   AMDModuleDefinition() {
     getParent() instanceof ExprStmt and
     getCallee().(GlobalVarAccess).getName() = "define" and
-    exists (int n | n = getNumArgument() |
-      n = 1 or
-      n = 2 and getArgument(0) instanceof ArrayExpr or
+    exists(int n | n = getNumArgument() |
+      n = 1
+      or
+      n = 2 and getArgument(0) instanceof ArrayExpr
+      or
       n = 3 and getArgument(0) instanceof ConstantString and getArgument(1) instanceof ArrayExpr
     )
   }
@@ -41,9 +43,7 @@ class AMDModuleDefinition extends CallExpr {
   }
 
   /** Gets the `i`th dependency of this module definition. */
-  PathExpr getDependency(int i) {
-    result = getDependencies().getElement(i)
-  }
+  PathExpr getDependency(int i) { result = getDependencies().getElement(i) }
 
   /** Gets a dependency of this module definition. */
   PathExpr getADependency() {
@@ -57,10 +57,7 @@ class AMDModuleDefinition extends CallExpr {
    * Gets the factory expression of this module definition,
    * which may be a function or a literal.
    */
-  deprecated
-  Expr getFactoryExpr() {
-    result = getFactoryNode().asExpr()
-  }
+  deprecated Expr getFactoryExpr() { result = getFactoryNode().asExpr() }
 
   /**
    * Gets a data flow node containing the factory value of this module definition.
@@ -73,26 +70,24 @@ class AMDModuleDefinition extends CallExpr {
 
   /** Gets the expression defining this module. */
   Expr getModuleExpr() {
-    exists (DataFlow::Node f | f = getFactoryNode() |
-      if f instanceof DataFlow::FunctionNode then
-        exists (ReturnStmt ret | ret.getContainer() = f.(DataFlow::FunctionNode).getAstNode() |
+    exists(DataFlow::Node f | f = getFactoryNode() |
+      if f instanceof DataFlow::FunctionNode
+      then
+        exists(ReturnStmt ret | ret.getContainer() = f.(DataFlow::FunctionNode).getAstNode() |
           result = ret.getExpr()
         )
-      else
-        result = f.asExpr()
+      else result = f.asExpr()
     )
   }
 
   /** Gets a source node whose value becomes the definition of this module. */
-  DataFlow::SourceNode getAModuleSource() {
-    result.flowsToExpr(getModuleExpr())
-  }
+  DataFlow::SourceNode getAModuleSource() { result.flowsToExpr(getModuleExpr()) }
 
   /**
    * Holds if `p` is the parameter corresponding to dependency `dep`.
    */
   predicate dependencyParameter(PathExpr dep, Parameter p) {
-    exists (int i |
+    exists(int i |
       dep = getDependency(i) and
       p = getFactoryParameter(i)
     )
@@ -111,7 +106,7 @@ class AMDModuleDefinition extends CallExpr {
    * `dep1` and `dep2`.
    */
   Parameter getDependencyParameter(string name) {
-    exists (PathExpr dep |
+    exists(PathExpr dep |
       dependencyParameter(dep, result) and
       dep.getValue() = name
     )
@@ -128,21 +123,21 @@ class AMDModuleDefinition extends CallExpr {
    * Gets the parameter corresponding to the pseudo-dependency `require`.
    */
   SimpleParameter getRequireParameter() {
-    result = getDependencyParameter("require") or
+    result = getDependencyParameter("require")
+    or
     // if no dependencies are listed, the first parameter is assumed to be `require`
     not exists(getDependencies()) and result = getFactoryParameter(0)
   }
 
   pragma[noinline]
-  private Variable getRequireVariable() {
-    result = getRequireParameter().getVariable()
-  }
+  private Variable getRequireVariable() { result = getRequireParameter().getVariable() }
 
   /**
    * Gets the parameter corresponding to the pseudo-dependency `exports`.
    */
   SimpleParameter getExportsParameter() {
-    result = getDependencyParameter("exports") or
+    result = getDependencyParameter("exports")
+    or
     // if no dependencies are listed, the second parameter is assumed to be `exports`
     not exists(getDependencies()) and result = getFactoryParameter(1)
   }
@@ -151,7 +146,8 @@ class AMDModuleDefinition extends CallExpr {
    * Gets the parameter corresponding to the pseudo-dependency `module`.
    */
   SimpleParameter getModuleParameter() {
-    result = getDependencyParameter("module") or
+    result = getDependencyParameter("module")
+    or
     // if no dependencies are listed, the third parameter is assumed to be `module`
     not exists(getDependencies()) and result = getFactoryParameter(2)
   }
@@ -165,10 +161,11 @@ class AMDModuleDefinition extends CallExpr {
     result = getModuleExpr().analyze().getAValue()
     or
     // explicit exports: anything assigned to `module.exports`
-    exists (AbstractProperty moduleExports, AMDModule m |
+    exists(AbstractProperty moduleExports, AMDModule m |
       this = m.getDefine() and
       moduleExports.getBase().(AbstractModuleObject).getModule() = m and
-      moduleExports.getPropertyName() = "exports" |
+      moduleExports.getPropertyName() = "exports"
+    |
       result = moduleExports.getAValue()
     )
   }
@@ -184,7 +181,7 @@ class AMDModuleDefinition extends CallExpr {
 /** A path expression appearing in the list of dependencies of an AMD module. */
 private class AMDDependencyPath extends PathExprInModule, ConstantString {
   AMDDependencyPath() {
-    exists (AMDModuleDefinition amd | this.getParentExpr*() = amd.getDependencies().getAnElement())
+    exists(AMDModuleDefinition amd | this.getParentExpr*() = amd.getDependencies().getAnElement())
   }
 
   override string getValue() { result = this.(ConstantString).getStringValue() }
@@ -193,7 +190,7 @@ private class AMDDependencyPath extends PathExprInModule, ConstantString {
 /** A path expression appearing in a `require` call in an AMD module. */
 private class AMDRequirePath extends PathExprInModule, ConstantString {
   AMDRequirePath() {
-    exists (AMDModuleDefinition amd | this.getParentExpr*() = amd.getARequireCall().getAnArgument())
+    exists(AMDModuleDefinition amd | this.getParentExpr*() = amd.getARequireCall().getAnArgument())
   }
 
   override string getValue() { result = this.(ConstantString).getStringValue() }
@@ -212,21 +209,15 @@ private predicate amdModuleTopLevel(AMDModuleDefinition def, TopLevel tl) {
  * An AMD-style module.
  */
 class AMDModule extends Module {
-  AMDModule() {
-    strictcount (AMDModuleDefinition def | amdModuleTopLevel(def, this)) = 1
-  }
+  AMDModule() { strictcount(AMDModuleDefinition def | amdModuleTopLevel(def, this)) = 1 }
 
   /** Gets the definition of this module. */
-  AMDModuleDefinition getDefine() {
-    amdModuleTopLevel(result, this)
-  }
+  AMDModuleDefinition getDefine() { amdModuleTopLevel(result, this) }
 
-  override Module getAnImportedModule() {
-    result.getFile() = resolve(getDefine().getADependency())
-  }
+  override Module getAnImportedModule() { result.getFile() = resolve(getDefine().getADependency()) }
 
   override predicate exports(string name, ASTNode export) {
-    exists (DataFlow::PropWrite pwn | export = pwn.getAstNode() |
+    exists(DataFlow::PropWrite pwn | export = pwn.getAstNode() |
       pwn.getBase().analyze().getAValue() = getDefine().getAModuleExportsValue() and
       name = pwn.getPropertyName()
     )
diff --git a/javascript/ql/src/semmle/javascript/AST.qll b/javascript/ql/src/semmle/javascript/AST.qll
index 696d0b1af91c..666bd0951d1b 100644
--- a/javascript/ql/src/semmle/javascript/AST.qll
+++ b/javascript/ql/src/semmle/javascript/AST.qll
@@ -12,13 +12,11 @@ import javascript
  * such as obtaining the children of an AST node.
  */
 class ASTNode extends @ast_node, Locatable {
-  override Location getLocation() {
-    hasLocation(this, result)
-  }
+  override Location getLocation() { hasLocation(this, result) }
 
   /** Gets the first token belonging to this element. */
   Token getFirstToken() {
-    exists (Location l1, Location l2 |
+    exists(Location l1, Location l2 |
       l1 = this.getLocation() and
       l2 = result.getLocation() and
       l1.getFile() = l2.getFile() and
@@ -29,7 +27,7 @@ class ASTNode extends @ast_node, Locatable {
 
   /** Gets the last token belonging to this element. */
   Token getLastToken() {
-    exists (Location l1, Location l2 |
+    exists(Location l1, Location l2 |
       l1 = this.getLocation() and
       l2 = result.getLocation() and
       l1.getFile() = l2.getFile() and
@@ -42,13 +40,20 @@ class ASTNode extends @ast_node, Locatable {
 
   /** Gets a token belonging to this element. */
   Token getAToken() {
-    exists (string path, int sl, int sc, int el, int ec,
-                  int tksl, int tksc, int tkel, int tkec |
+    exists(string path, int sl, int sc, int el, int ec, int tksl, int tksc, int tkel, int tkec |
       this.getLocation().hasLocationInfo(path, sl, sc, el, ec) and
-      result.getLocation().hasLocationInfo(path, tksl, tksc, tkel, tkec) |
-      (sl < tksl or (sl = tksl and sc <= tksc))
-      and
-      (tkel < el or (tkel = el and tkec <= ec))
+      result.getLocation().hasLocationInfo(path, tksl, tksc, tkel, tkec)
+    |
+      (
+        sl < tksl
+        or
+        (sl = tksl and sc <= tksc)
+      ) and
+      (
+        tkel < el
+        or
+        (tkel = el and tkec <= ec)
+      )
     ) and
     // exclude empty EOF token
     not result instanceof EOFToken
@@ -56,9 +61,7 @@ class ASTNode extends @ast_node, Locatable {
 
   /** Gets the toplevel syntactic unit to which this element belongs. */
   cached
-  TopLevel getTopLevel() {
-    result = getParent().getTopLevel()
-  }
+  TopLevel getTopLevel() { result = getParent().getTopLevel() }
 
   /**
    * Gets the `i`th child node of this node.
@@ -74,64 +77,40 @@ class ASTNode extends @ast_node, Locatable {
   }
 
   /** Gets the `i`th child statement of this node. */
-  Stmt getChildStmt(int i) {
-    stmts(result, _, this, i, _)
-  }
+  Stmt getChildStmt(int i) { stmts(result, _, this, i, _) }
 
   /** Gets the `i`th child expression of this node. */
-  Expr getChildExpr(int i) {
-    exprs(result, _, this, i, _)
-  }
+  Expr getChildExpr(int i) { exprs(result, _, this, i, _) }
 
   /** Gets the `i`th child type expression of this node. */
-  TypeExpr getChildTypeExpr(int i) {
-    typeexprs(result, _, this, i, _)
-  }
+  TypeExpr getChildTypeExpr(int i) { typeexprs(result, _, this, i, _) }
 
   /** Gets a child node of this node. */
-  ASTNode getAChild() {
-    result = getChild(_)
-  }
+  ASTNode getAChild() { result = getChild(_) }
 
   /** Gets a child expression of this node. */
-  Expr getAChildExpr() {
-    result = getChildExpr(_)
-  }
+  Expr getAChildExpr() { result = getChildExpr(_) }
 
   /** Gets a child statement of this node. */
-  Stmt getAChildStmt() {
-    result = getChildStmt(_)
-  }
+  Stmt getAChildStmt() { result = getChildStmt(_) }
 
   /** Gets the number of child nodes of this node. */
-  int getNumChild() {
-    result = count(getAChild())
-  }
+  int getNumChild() { result = count(getAChild()) }
 
   /** Gets the number of child expressions of this node. */
-  int getNumChildExpr() {
-    result = count(getAChildExpr())
-  }
+  int getNumChildExpr() { result = count(getAChildExpr()) }
 
   /** Gets the number of child statements of this node. */
-  int getNumChildStmt() {
-    result = count(getAChildStmt())
-  }
+  int getNumChildStmt() { result = count(getAChildStmt()) }
 
   /** Gets the parent node of this node, if any. */
-  ASTNode getParent() {
-    this = result.getAChild()
-  }
+  ASTNode getParent() { this = result.getAChild() }
 
   /** Gets the first control flow node belonging to this syntactic entity. */
-  ControlFlowNode getFirstControlFlowNode() {
-    result = this
-  }
+  ControlFlowNode getFirstControlFlowNode() { result = this }
 
   /** Holds if this syntactic entity belongs to an externs file. */
-  predicate inExternsFile() {
-    getTopLevel().isExterns()
-  }
+  predicate inExternsFile() { getTopLevel().isExterns() }
 
   /**
    * Holds if this is part of an ambient declaration or type annotation in a TypeScript file.
@@ -142,9 +121,7 @@ class ASTNode extends @ast_node, Locatable {
    * The TypeScript compiler emits no code for ambient declarations, but they
    * can affect name resolution and type checking at compile-time.
    */
-  predicate isAmbient() {
-    getParent().isAmbient()
-  }
+  predicate isAmbient() { getParent().isAmbient() }
 }
 
 /**
@@ -158,9 +135,9 @@ class TopLevel extends @toplevel, StmtContainer {
     // file name contains 'min' (not as part of a longer word)
     getFile().getBaseName().regexpMatch(".*[^-.]*[-.]min([-.].*)?\\.\\w+")
     or
-    exists (int numstmt | numstmt = strictcount(Stmt s | s.getTopLevel() = this) |
+    exists(int numstmt | numstmt = strictcount(Stmt s | s.getTopLevel() = this) |
       // there are more than two statements per line on average
-      (float)numstmt / getNumberOfLines() > 2 and
+      numstmt.(float) / getNumberOfLines() > 2 and
       // and there are at least ten statements overall
       numstmt >= 10
     )
@@ -169,45 +146,32 @@ class TopLevel extends @toplevel, StmtContainer {
   /** Holds if this toplevel is an externs definitions file. */
   predicate isExterns() {
     // either it was explicitly extracted as an externs file...
-    isExterns(this) or
+    isExterns(this)
+    or
     // ...or it has a comment with an `@externs` tag in it
-    exists (JSDocTag externs |
+    exists(JSDocTag externs |
       externs.getTitle() = "externs" and
       externs.getTopLevel() = this
     )
   }
 
   /** Gets the toplevel to which this element belongs, that is, itself. */
-  override TopLevel getTopLevel() {
-    result = this
-  }
+  override TopLevel getTopLevel() { result = this }
 
   /** Gets the number of lines in this toplevel. */
-  int getNumberOfLines() {
-    numlines(this, result, _, _)
-  }
+  int getNumberOfLines() { numlines(this, result, _, _) }
 
   /** Gets the number of lines containing code in this toplevel. */
-  int getNumberOfLinesOfCode() {
-    numlines(this, _, result, _)
-  }
+  int getNumberOfLinesOfCode() { numlines(this, _, result, _) }
 
   /** Gets the number of lines containing comments in this toplevel. */
-  int getNumberOfLinesOfComments() {
-    numlines(this, _, _, result)
-  }
+  int getNumberOfLinesOfComments() { numlines(this, _, _, result) }
 
-  override predicate isStrict() {
-    getAStmt() instanceof StrictModeDecl
-  }
+  override predicate isStrict() { getAStmt() instanceof StrictModeDecl }
 
-  override ControlFlowNode getFirstControlFlowNode() {
-    result = getEntry()
-  }
+  override ControlFlowNode getFirstControlFlowNode() { result = getEntry() }
 
-  override string toString() {
-    result = "<toplevel>"
-  }
+  override string toString() { result = "<toplevel>" }
 
   override predicate isAmbient() {
     getFile().getFileType().isTypeScript() and
@@ -218,50 +182,40 @@ class TopLevel extends @toplevel, StmtContainer {
 /**
  * A stand-alone file or script originating from an HTML `<script>` element.
  */
-abstract class Script extends TopLevel {
-}
+abstract class Script extends TopLevel { }
 
 /**
  * A stand-alone file or an external script originating from an HTML `<script>` element.
  */
-class ExternalScript extends @script, Script {
-}
+class ExternalScript extends @script, Script { }
 
 /**
  * A script embedded inline in an HTML `<script>` element.
  */
-class InlineScript extends @inline_script, Script {
-}
+class InlineScript extends @inline_script, Script { }
 
 /**
  * A code snippet originating from an HTML attribute value.
  */
-abstract class CodeInAttribute extends TopLevel {
-}
+abstract class CodeInAttribute extends TopLevel { }
 
 /**
  * A code snippet originating from an event handler attribute.
  */
-class EventHandlerCode extends @event_handler, CodeInAttribute {
-}
+class EventHandlerCode extends @event_handler, CodeInAttribute { }
 
 /**
  * A code snippet originating from a URL with the `javascript:` URL scheme.
  */
-class JavaScriptURL extends @javascript_url, CodeInAttribute {
-}
+class JavaScriptURL extends @javascript_url, CodeInAttribute { }
 
 /**
  * A toplevel syntactic entity containing Closure-style externs definitions.
  */
-class Externs extends TopLevel {
-  Externs() {
-    isExterns()
-  }
-}
+class Externs extends TopLevel { Externs() { isExterns() } }
 
 /** A program element that is either an expression or a statement. */
-class ExprOrStmt extends @exprorstmt, ControlFlowNode, ASTNode {}
+class ExprOrStmt extends @exprorstmt, ControlFlowNode, ASTNode { }
 
 /**
  * A program element that contains statements, but isn't itself
@@ -269,9 +223,7 @@ class ExprOrStmt extends @exprorstmt, ControlFlowNode, ASTNode {}
  */
 class StmtContainer extends @stmt_container, ASTNode {
   /** Gets the innermost enclosing container in which this container is nested. */
-  StmtContainer getEnclosingContainer() {
-    none()
-  }
+  StmtContainer getEnclosingContainer() { none() }
 
   /**
    * Gets the innermost enclosing function or top-level,
@@ -284,16 +236,13 @@ class StmtContainer extends @stmt_container, ASTNode {
    * function boundaries.  In plain JavaScript, all containers are function boundaries.
    */
   StmtContainer getFunctionBoundary() {
-    if (this instanceof Function or this instanceof TopLevel) then
-      result = this
-    else
-      result = getEnclosingContainer().getFunctionBoundary()
+    if (this instanceof Function or this instanceof TopLevel)
+    then result = this
+    else result = getEnclosingContainer().getFunctionBoundary()
   }
 
   /** Gets a statement that belongs to this container. */
-  Stmt getAStmt() {
-    result.getContainer() = this
-  }
+  Stmt getAStmt() { result.getContainer() = this }
 
   /**
    * Gets the body of this container.
@@ -301,9 +250,7 @@ class StmtContainer extends @stmt_container, ASTNode {
    * For scripts or modules, this is the container itself; for functions,
    * it is the function body.
    */
-  ASTNode getBody() {
-    result = this
-  }
+  ASTNode getBody() { result = this }
 
   /**
    * Gets the (unique) entry node of the control flow graph for this toplevel or function.
@@ -311,14 +258,10 @@ class StmtContainer extends @stmt_container, ASTNode {
    * For most purposes, the start node should be used instead of the entry node;
    * see predicate `getStart()`.
    */
-  ControlFlowEntryNode getEntry() {
-    result.getContainer() = this
-  }
+  ControlFlowEntryNode getEntry() { result.getContainer() = this }
 
   /** Gets the (unique) exit node of the control flow graph for this toplevel or function. */
-  ControlFlowExitNode getExit() {
-    result.getContainer() = this
-  }
+  ControlFlowExitNode getExit() { result.getContainer() = this }
 
   /**
    * Gets the (unique) CFG node at which execution of this toplevel or function begins.
@@ -329,39 +272,29 @@ class StmtContainer extends @stmt_container, ASTNode {
    *
    * Empty toplevels do not have a start node.
    */
-  ConcreteControlFlowNode getStart() {
-    successor(getEntry(), result)
-  }
+  ConcreteControlFlowNode getStart() { successor(getEntry(), result) }
 
   /**
    * Gets the entry basic block of this function, that is, the basic block
    * containing the entry node of its CFG.
    */
-  EntryBasicBlock getEntryBB() {
-    result = getEntry()
-  }
+  EntryBasicBlock getEntryBB() { result = getEntry() }
 
   /**
    * Gets the start basic block of this function, that is, the basic block
    * containing the start node of its CFG.
    */
-  BasicBlock getStartBB() {
-    result.getANode() = getStart()
-  }
+  BasicBlock getStartBB() { result.getANode() = getStart() }
 
   /** Gets the scope induced by this toplevel or function, if any. */
-  Scope getScope() {
-    scopenodes(this, result)
-  }
+  Scope getScope() { scopenodes(this, result) }
 
   /**
    * Holds if the code in this container is executed in ECMAScript strict mode.
    *
    * See Annex C of the ECMAScript language specification.
    */
-  predicate isStrict() {
-    getEnclosingContainer().isStrict()
-  }
+  predicate isStrict() { getEnclosingContainer().isStrict() }
 }
 
 /**
@@ -376,13 +309,9 @@ module AST {
    */
   class ValueNode extends ASTNode, @dataflownode {
     /** Gets type inference results for this element. */
-    DataFlow::AnalyzedNode analyze() {
-      result = DataFlow::valueNode(this).analyze()
-    }
+    DataFlow::AnalyzedNode analyze() { result = DataFlow::valueNode(this).analyze() }
 
     /** Gets the data flow node associated with this program element. */
-    DataFlow::ValueNode flow() {
-      result = DataFlow::valueNode(this)
-    }
+    DataFlow::ValueNode flow() { result = DataFlow::valueNode(this) }
   }
 }
diff --git a/javascript/ql/src/semmle/javascript/Aliases.qll b/javascript/ql/src/semmle/javascript/Aliases.qll
index 2e8d394e227c..ff0ab65daa01 100644
--- a/javascript/ql/src/semmle/javascript/Aliases.qll
+++ b/javascript/ql/src/semmle/javascript/Aliases.qll
@@ -6,32 +6,61 @@
 import javascript
 
 class AndBitwiseExpr = BitAndExpr;
+
 class AndLogicalExpr = LogAndExpr;
+
 class ArrayAccess = IndexExpr;
+
 class AssignOp = CompoundAssignExpr;
+
 class Block = BlockStmt;
+
 class BoolLiteral = BooleanLiteral;
+
 class CaseStmt = Case;
+
 class ComparisonOperation = Comparison;
+
 class DoStmt = DoWhileStmt;
+
 class EqualityOperation = EqualityTest;
+
 class FieldAccess = DotExpr;
+
 class InstanceOfExpr = InstanceofExpr;
+
 class LabelStmt = LabeledStmt;
+
 class LogicalAndExpr = LogAndExpr;
+
 class LogicalNotExpr = LogNotExpr;
+
 class LogicalOrExpr = LogOrExpr;
+
 class Loop = LoopStmt;
+
 class MultilineComment = BlockComment;
+
 class OrBitwiseExpr = BitOrExpr;
+
 class OrLogicalExpr = LogOrExpr;
+
 class ParenthesisExpr = ParExpr;
+
 class ParenthesizedExpr = ParExpr;
+
 class RelationalOperation = RelationalComparison;
+
 class RemExpr = ModExpr;
+
 class SingleLineComment = LineComment;
+
 class SuperAccess = SuperExpr;
+
 class SwitchCase = Case;
+
 class ThisAccess = ThisExpr;
+
 class VariableAccess = VarAccess;
+
 class XorBitwiseExpr = XOrExpr;
diff --git a/javascript/ql/src/semmle/javascript/BasicBlocks.qll b/javascript/ql/src/semmle/javascript/BasicBlocks.qll
index 329bdd339a92..fb9c9d340511 100644
--- a/javascript/ql/src/semmle/javascript/BasicBlocks.qll
+++ b/javascript/ql/src/semmle/javascript/BasicBlocks.qll
@@ -9,8 +9,10 @@ import javascript
  * Holds if `nd` starts a new basic block.
  */
 private predicate startsBB(ControlFlowNode nd) {
-  (not exists(nd.getAPredecessor()) and exists(nd.getASuccessor())) or
-  nd.isJoin() or
+  (not exists(nd.getAPredecessor()) and exists(nd.getASuccessor()))
+  or
+  nd.isJoin()
+  or
   nd.getAPredecessor().isBranch()
 }
 
@@ -18,29 +20,22 @@ private predicate startsBB(ControlFlowNode nd) {
  * Holds if the first node of basic block `succ` is a control flow
  * successor of the last node of basic block `bb`.
  */
-private predicate succBB(BasicBlock bb, BasicBlock succ) {
-  succ = bb.getLastNode().getASuccessor()
-}
+private predicate succBB(BasicBlock bb, BasicBlock succ) { succ = bb.getLastNode().getASuccessor() }
 
 /**
  * Holds if the first node of basic block `bb` is a control flow
  * successor of the last node of basic block `pre`.
  */
-private predicate predBB(BasicBlock bb, BasicBlock pre) {
-  succBB(pre, bb)
-}
+private predicate predBB(BasicBlock bb, BasicBlock pre) { succBB(pre, bb) }
 
 /** Holds if `bb` is an entry basic block. */
-private predicate entryBB(BasicBlock bb) {
-  bb.getFirstNode() instanceof ControlFlowEntryNode
-}
+private predicate entryBB(BasicBlock bb) { bb.getFirstNode() instanceof ControlFlowEntryNode }
 
 /** Holds if `bb` is an exit basic block. */
-private predicate exitBB(BasicBlock bb) {
-  bb.getLastNode() instanceof ControlFlowExitNode
-}
+private predicate exitBB(BasicBlock bb) { bb.getLastNode() instanceof ControlFlowExitNode }
 
-private cached module Internal {
+cached
+private module Internal {
   /**
    * Holds if `succ` is a control flow successor of `nd` within the same basic block.
    */
@@ -55,54 +50,61 @@ private cached module Internal {
    * In other words, `i` is the shortest distance from a node `bb`
    * that starts a basic block to `nd` along the `intraBBSucc` relation.
    */
-  cached predicate bbIndex(BasicBlock bb, ControlFlowNode nd, int i) =
+  cached
+  predicate bbIndex(BasicBlock bb, ControlFlowNode nd, int i) =
     shortestDistances(startsBB/1, intraBBSucc/2)(bb, nd, i)
 
-  cached int bbLength(BasicBlock bb) {
-    result = strictcount(ControlFlowNode nd | bbIndex(bb, nd, _))
-  }
+  cached
+  int bbLength(BasicBlock bb) { result = strictcount(ControlFlowNode nd | bbIndex(bb, nd, _)) }
 
-  cached predicate useAt(BasicBlock bb, int i, Variable v, VarUse u) {
+  cached
+  predicate useAt(BasicBlock bb, int i, Variable v, VarUse u) {
     v = u.getVariable() and bbIndex(bb, u, i)
   }
 
-  cached predicate defAt(BasicBlock bb, int i, Variable v, VarDef d) {
-    exists (VarRef lhs |
+  cached
+  predicate defAt(BasicBlock bb, int i, Variable v, VarDef d) {
+    exists(VarRef lhs |
       lhs = d.getTarget().(BindingPattern).getABindingVarRef() and
-      v = lhs.getVariable() |
+      v = lhs.getVariable()
+    |
       lhs = d.getTarget() and
       bbIndex(bb, d, i)
       or
-      exists (PropertyPattern pp |
+      exists(PropertyPattern pp |
         lhs = pp.getValuePattern() and
         bbIndex(bb, pp, i)
       )
       or
-      exists (ObjectPattern op |
+      exists(ObjectPattern op |
         lhs = op.getRest() and
         bbIndex(bb, lhs, i)
       )
       or
-      exists (ArrayPattern ap |
+      exists(ArrayPattern ap |
         lhs = ap.getAnElement() and
         bbIndex(bb, lhs, i)
       )
     )
   }
 
-  cached predicate reachableBB(BasicBlock bb) {
-    entryBB(bb) or
-    exists (BasicBlock predBB | succBB(predBB, bb) | reachableBB(predBB))
+  cached
+  predicate reachableBB(BasicBlock bb) {
+    entryBB(bb)
+    or
+    exists(BasicBlock predBB | succBB(predBB, bb) | reachableBB(predBB))
   }
 }
 private import Internal
 
 /** Holds if `dom` is an immediate dominator of `bb`. */
-private cached predicate bbIDominates(BasicBlock dom, BasicBlock bb) =
+cached
+private predicate bbIDominates(BasicBlock dom, BasicBlock bb) =
   idominance(entryBB/1, succBB/2)(_, dom, bb)
 
 /** Holds if `dom` is an immediate post-dominator of `bb`. */
-private cached predicate bbIPostDominates(BasicBlock dom, BasicBlock bb) =
+cached
+private predicate bbIPostDominates(BasicBlock dom, BasicBlock bb) =
   idominance(exitBB/1, predBB/2)(_, dom, bb)
 
 /**
@@ -112,46 +114,34 @@ private cached predicate bbIPostDominates(BasicBlock dom, BasicBlock bb) =
  * At the database level, a basic block is represented by its first control flow node.
  */
 class BasicBlock extends @cfg_node, Locatable {
-  BasicBlock() {
-    startsBB(this)
-  }
+  BasicBlock() { startsBB(this) }
 
   /** Gets a basic block succeeding this one. */
-  BasicBlock getASuccessor() {
-    succBB(this, result)
-  }
+  BasicBlock getASuccessor() { succBB(this, result) }
 
   /** Gets a basic block preceding this one. */
-  BasicBlock getAPredecessor() {
-    result.getASuccessor() = this
-  }
+  BasicBlock getAPredecessor() { result.getASuccessor() = this }
 
   /** Gets a node in this block. */
   ControlFlowNode getANode() { result = getNode(_) }
 
   /** Gets the node at the given position in this block. */
-  ControlFlowNode getNode(int pos) {
-    bbIndex(this, result, pos)
-  }
+  ControlFlowNode getNode(int pos) { bbIndex(this, result, pos) }
 
   /** Gets the first node in this block. */
   ControlFlowNode getFirstNode() { result = this }
 
   /** Gets the last node in this block. */
-  ControlFlowNode getLastNode() { result = getNode(length()-1) }
+  ControlFlowNode getLastNode() { result = getNode(length() - 1) }
 
   /** Gets the length of this block. */
   int length() { result = bbLength(this) }
 
   /** Holds if this basic block uses variable `v` in its `i`th node `u`. */
-  predicate useAt(int i, Variable v, VarUse u) {
-    useAt(this, i, v, u)
-  }
+  predicate useAt(int i, Variable v, VarUse u) { useAt(this, i, v, u) }
 
   /** Holds if this basic block defines variable `v` in its `i`th node `u`. */
-  predicate defAt(int i, Variable v, VarDef d) {
-    defAt(this, i, v, d)
-  }
+  predicate defAt(int i, Variable v, VarDef d) { defAt(this, i, v, d) }
 
   /**
    * Holds if `v` is live at entry to this basic block and `u` is a use of `v`
@@ -165,10 +155,13 @@ class BasicBlock extends @cfg_node, Locatable {
   predicate isLiveAtEntry(Variable v, VarUse u) {
     // restrict `u` to be reachable from this basic block
     u = getASuccessor*().getANode() and
-    (// shortcut: if `v` is never defined, then it must be live
-     isDefinedInSameContainer(v) implies
-     // otherwise, do full liveness computation
-     isLiveAtEntryImpl(v, u))
+    (
+      // shortcut: if `v` is never defined, then it must be live
+      isDefinedInSameContainer(v)
+      implies
+      // otherwise, do full liveness computation
+      isLiveAtEntryImpl(v, u)
+    )
   }
 
   /**
@@ -189,7 +182,7 @@ class BasicBlock extends @cfg_node, Locatable {
    * this basic block belongs.
    */
   private predicate isDefinedInSameContainer(Variable v) {
-    exists (VarDef def | def.getAVariable() = v and def.getContainer() = getContainer())
+    exists(VarDef def | def.getAVariable() = v and def.getContainer() = getContainer())
   }
 
   /**
@@ -199,7 +192,8 @@ class BasicBlock extends @cfg_node, Locatable {
    * be more efficient on large databases.
    */
   predicate isLiveAtEntry(Variable v) {
-    isLocallyLiveAtEntry(v, _) or
+    isLocallyLiveAtEntry(v, _)
+    or
     (not this.defAt(_, v, _) and getASuccessor().isLiveAtEntry(v))
   }
 
@@ -208,7 +202,8 @@ class BasicBlock extends @cfg_node, Locatable {
    * `u` is a use of `v` witnessing the liveness.
    */
   predicate localIsLiveAtEntry(LocalVariable v, VarUse u) {
-    isLocallyLiveAtEntry(v, u) or
+    isLocallyLiveAtEntry(v, u)
+    or
     (not this.defAt(_, v, _) and getASuccessor().localIsLiveAtEntry(v, u))
   }
 
@@ -216,7 +211,8 @@ class BasicBlock extends @cfg_node, Locatable {
    * Holds if local variable `v` is live at entry to this basic block.
    */
   predicate localIsLiveAtEntry(LocalVariable v) {
-    isLocallyLiveAtEntry(v, _) or
+    isLocallyLiveAtEntry(v, _)
+    or
     (not this.defAt(_, v, _) and getASuccessor().localIsLiveAtEntry(v))
   }
 
@@ -225,7 +221,8 @@ class BasicBlock extends @cfg_node, Locatable {
    * this basic block without going through a redefinition of `v`.
    */
   predicate localMayBeOverwritten(LocalVariable v, VarDef d) {
-    isLocallyOverwritten(v, d) or
+    isLocallyOverwritten(v, d)
+    or
     (not defAt(_, v, _) and getASuccessor().localMayBeOverwritten(v, d))
   }
 
@@ -237,7 +234,10 @@ class BasicBlock extends @cfg_node, Locatable {
    */
   private int nextDefOrUseAfter(PurelyLocalVariable v, int i, VarDef d) {
     defAt(i, v, d) and
-    result = min(int j | (defAt(j, v, _) or useAt(j, v, _) or j = length()) and j > i)
+    result = min(int j |
+        (defAt(j, v, _) or useAt(j, v, _) or j = length()) and
+        j > i
+      )
   }
 
   /**
@@ -246,8 +246,9 @@ class BasicBlock extends @cfg_node, Locatable {
    * definition and before a re-definition.
    */
   predicate localLiveDefAt(PurelyLocalVariable v, int i, VarDef d) {
-    exists (int j | j = nextDefOrUseAfter(v, i, d) |
-      useAt(j, v, _) or
+    exists(int j | j = nextDefOrUseAfter(v, i, d) |
+      useAt(j, v, _)
+      or
       j = length() and getASuccessor().localIsLiveAtEntry(v)
     )
   }
@@ -257,9 +258,7 @@ class BasicBlock extends @cfg_node, Locatable {
    * no definitions of `v` before it.
    */
   private predicate isLocallyLiveAtEntry(Variable v, VarUse u) {
-    exists (int n | useAt(n, v, u) |
-      not exists (int m | m < n | defAt(m, v, _))
-    )
+    exists(int n | useAt(n, v, u) | not exists(int m | m < n | defAt(m, v, _)))
   }
 
   /**
@@ -267,57 +266,43 @@ class BasicBlock extends @cfg_node, Locatable {
    * no other definitions of `v` before it.
    */
   private predicate isLocallyOverwritten(Variable v, VarDef d) {
-    exists (int n | defAt(n, v, d) |
-      not exists (int m | m < n | defAt(m, v, _))
-    )
+    exists(int n | defAt(n, v, d) | not exists(int m | m < n | defAt(m, v, _)))
   }
 
   /**
    * Gets the function or script to which this basic block belongs.
    */
-  StmtContainer getContainer() {
-    result = getFirstNode().getContainer()
-  }
+  StmtContainer getContainer() { result = getFirstNode().getContainer() }
 
   /**
    * Gets the basic block that immediately dominates this basic block.
    */
-  ReachableBasicBlock getImmediateDominator() {
-    bbIDominates(result, this)
-  }
+  ReachableBasicBlock getImmediateDominator() { bbIDominates(result, this) }
 }
 
 /**
  * An unreachable basic block, that is, a basic block
  * whose first node is unreachable.
  */
-class UnreachableBlock extends BasicBlock {
-  UnreachableBlock() { getFirstNode().isUnreachable() }
-}
+class UnreachableBlock extends BasicBlock { UnreachableBlock() { getFirstNode().isUnreachable() } }
 
 /**
  * An entry basic block, that is, a basic block
  * whose first node is the entry node of a statement container.
  */
-class EntryBasicBlock extends BasicBlock {
-  EntryBasicBlock() { entryBB(this) }
-}
+class EntryBasicBlock extends BasicBlock { EntryBasicBlock() { entryBB(this) } }
 
 /**
  * A basic block that is reachable from an entry basic block.
  */
 class ReachableBasicBlock extends BasicBlock {
-  ReachableBasicBlock() {
-    reachableBB(this)
-  }
+  ReachableBasicBlock() { reachableBB(this) }
 
   /**
    * Holds if this basic block strictly dominates `bb`.
    */
   cached
-  predicate strictlyDominates(ReachableBasicBlock bb) {
-    bbIDominates+(this, bb)
-  }
+  predicate strictlyDominates(ReachableBasicBlock bb) { bbIDominates+(this, bb) }
 
   /**
    * Holds if this basic block dominates `bb`.
@@ -333,9 +318,7 @@ class ReachableBasicBlock extends BasicBlock {
    * Holds if this basic block strictly post-dominates `bb`.
    */
   cached
-  predicate strictlyPostDominates(ReachableBasicBlock bb) {
-    bbIPostDominates+(this, bb)
-  }
+  predicate strictlyPostDominates(ReachableBasicBlock bb) { bbIPostDominates+(this, bb) }
 
   /**
    * Holds if this basic block post-dominates `bb`.
@@ -346,7 +329,6 @@ class ReachableBasicBlock extends BasicBlock {
     bb = this or
     strictlyPostDominates(bb)
   }
-
 }
 
 /**
@@ -366,7 +348,7 @@ class ReachableJoinBlock extends ReachableBasicBlock {
   predicate inDominanceFrontierOf(ReachableBasicBlock b) {
     b = getAPredecessor() and not b = getImmediateDominator()
     or
-    exists (ReachableBasicBlock prev | inDominanceFrontierOf(prev) |
+    exists(ReachableBasicBlock prev | inDominanceFrontierOf(prev) |
       b = prev.getImmediateDominator() and
       not b = getImmediateDominator()
     )
diff --git a/javascript/ql/src/semmle/javascript/CFG.qll b/javascript/ql/src/semmle/javascript/CFG.qll
index faec8deca6d8..00ad9b595005 100644
--- a/javascript/ql/src/semmle/javascript/CFG.qll
+++ b/javascript/ql/src/semmle/javascript/CFG.qll
@@ -281,40 +281,28 @@ import javascript
  */
 class ControlFlowNode extends @cfg_node, Locatable {
   /** Gets a node succeeding this node in the CFG. */
-  ControlFlowNode getASuccessor() {
-    successor(this, result)
-  }
+  ControlFlowNode getASuccessor() { successor(this, result) }
 
   /** Gets a node preceding this node in the CFG. */
-  ControlFlowNode getAPredecessor() {
-    this = result.getASuccessor()
-  }
+  ControlFlowNode getAPredecessor() { this = result.getASuccessor() }
 
   /** Holds if this is a node with more than one successor. */
-  predicate isBranch() {
-    strictcount(getASuccessor()) > 1
-  }
+  predicate isBranch() { strictcount(getASuccessor()) > 1 }
 
   /** Holds if this is a node with more than one predecessor. */
-  predicate isJoin() {
-    strictcount(getAPredecessor()) > 1
-  }
+  predicate isJoin() { strictcount(getAPredecessor()) > 1 }
 
   /**
    * Holds if this is a start node, that is, the CFG node where execution of a
    * toplevel or function begins.
    */
-  predicate isStart() {
-    this = any(StmtContainer sc).getStart()
-  }
+  predicate isStart() { this = any(StmtContainer sc).getStart() }
 
   /**
    * Holds if this is a final node, that is, a CFG node where execution of a
    * toplevel or function terminates.
    */
-  predicate isAFinalNode() {
-    getASuccessor().(SyntheticControlFlowNode).isAFinalNode()
-  }
+  predicate isAFinalNode() { getASuccessor().(SyntheticControlFlowNode).isAFinalNode() }
 
   /**
    * Holds if this node is unreachable, that is, it has no predecessors in the CFG.
@@ -330,7 +318,7 @@ class ControlFlowNode extends @cfg_node, Locatable {
    * `s1` is unreachable, but `s2` is not.
    */
   predicate isUnreachable() {
-    forall (ControlFlowNode pred | pred = getAPredecessor() |
+    forall(ControlFlowNode pred | pred = getAPredecessor() |
       pred.(SyntheticControlFlowNode).isUnreachable()
     )
     // note the override in ControlFlowEntryNode below
@@ -348,9 +336,7 @@ class ControlFlowNode extends @cfg_node, Locatable {
   }
 
   /** Gets the basic block this node belongs to. */
-  BasicBlock getBasicBlock() {
-    this = result.getANode()
-  }
+  BasicBlock getBasicBlock() { this = result.getANode() }
 
   /**
    * For internal use.
@@ -361,9 +347,10 @@ class ControlFlowNode extends @cfg_node, Locatable {
   string describeControlFlowNode() {
     if this = any(MethodDeclaration mem).getBody()
     then result = "function in " + any(MethodDeclaration mem | mem.getBody() = this)
-    else if this instanceof @decorator_list
-    then result = "parameter decorators of " + this.(ASTNode).getParent().(Function).describe()
-    else result = toString()
+    else
+      if this instanceof @decorator_list
+      then result = "parameter decorators of " + this.(ASTNode).getParent().(Function).describe()
+      else result = toString()
   }
 }
 
@@ -372,39 +359,25 @@ class ControlFlowNode extends @cfg_node, Locatable {
  * examples include guard nodes and entry/exit nodes.
  */
 class SyntheticControlFlowNode extends @synthetic_cfg_node, ControlFlowNode {
-  override Location getLocation() {
-    hasLocation(this, result)
-  }
+  override Location getLocation() { hasLocation(this, result) }
 }
 
 /** A synthetic CFG node marking the entry point of a function or toplevel script. */
 class ControlFlowEntryNode extends SyntheticControlFlowNode, @entry_node {
-  override StmtContainer getContainer() {
-    entry_cfg_node(this, result)
-  }
+  override StmtContainer getContainer() { entry_cfg_node(this, result) }
 
-  override predicate isUnreachable() {
-    none()
-  }
+  override predicate isUnreachable() { none() }
 
-  override string toString() {
-    result = "entry node of " + getContainer().toString()
-  }
+  override string toString() { result = "entry node of " + getContainer().toString() }
 }
 
 /** A synthetic CFG node marking the exit of a function or toplevel script. */
 class ControlFlowExitNode extends SyntheticControlFlowNode, @exit_node {
-  override StmtContainer getContainer() {
-    exit_cfg_node(this, result)
-  }
+  override StmtContainer getContainer() { exit_cfg_node(this, result) }
 
-  override predicate isAFinalNode() {
-    any()
-  }
+  override predicate isAFinalNode() { any() }
 
-  override string toString() {
-    result = "exit node of " + getContainer().toString()
-  }
+  override string toString() { result = "exit node of " + getContainer().toString() }
 }
 
 /**
@@ -413,9 +386,7 @@ class ControlFlowExitNode extends SyntheticControlFlowNode, @exit_node {
  */
 class GuardControlFlowNode extends SyntheticControlFlowNode, @guard_node {
   /** Gets the expression that this guard concerns. */
-  Expr getTest() {
-    guard_node(this, _, result)
-  }
+  Expr getTest() { guard_node(this, _, result) }
 
   /**
    * Holds if this guard dominates basic block `bb`, that is, the guard
@@ -426,9 +397,7 @@ class GuardControlFlowNode extends SyntheticControlFlowNode, @guard_node {
     dominates(bb.getImmediateDominator())
   }
 
-  override StmtContainer getContainer() {
-    result = getTest().getContainer()
-  }
+  override StmtContainer getContainer() { result = getTest().getContainer() }
 }
 
 /**
@@ -443,9 +412,7 @@ class ConditionGuardNode extends GuardControlFlowNode, @condition_guard {
     guard_node(this, 1, _) and result = true
   }
 
-  override string toString() {
-    result = "guard: " + getTest() + " is " + getOutcome()
-  }
+  override string toString() { result = "guard: " + getTest() + " is " + getOutcome() }
 }
 
 /**
@@ -453,7 +420,5 @@ class ConditionGuardNode extends GuardControlFlowNode, @condition_guard {
  * not a `SyntheticControlFlowNode`.
  */
 class ConcreteControlFlowNode extends ControlFlowNode {
-  ConcreteControlFlowNode() {
-    not this instanceof SyntheticControlFlowNode
-  }
+  ConcreteControlFlowNode() { not this instanceof SyntheticControlFlowNode }
 }
diff --git a/javascript/ql/src/semmle/javascript/CanonicalNames.qll b/javascript/ql/src/semmle/javascript/CanonicalNames.qll
index 2b81c43f8bff..1a07016e0ef0 100644
--- a/javascript/ql/src/semmle/javascript/CanonicalNames.qll
+++ b/javascript/ql/src/semmle/javascript/CanonicalNames.qll
@@ -37,38 +37,28 @@ class CanonicalName extends @symbol {
   /**
    * Gets the name of the external module represented by this canonical name, if any.
    */
-  string getExternalModuleName() {
-    symbol_module(this, result)
-  }
+  string getExternalModuleName() { symbol_module(this, result) }
 
   /**
    * Gets the name of the global variable represented by this canonical name, if any.
    */
-  string getGlobalName() {
-    symbol_global(this, result)
-  }
+  string getGlobalName() { symbol_global(this, result) }
 
   /**
    * Gets the module represented by this canonical name, if such a module exists
    * and was extracted.
    */
-  Module getModule() {
-    ast_node_symbol(result, this)
-  }
+  Module getModule() { ast_node_symbol(result, this) }
 
   /**
    * Holds if this canonical name has a child, i.e. an extension of its qualified name.
    */
-  predicate hasChild() {
-    exists (getAChild())
-  }
+  predicate hasChild() { exists(getAChild()) }
 
   /**
    * True if this has no parent.
    */
-  predicate isRoot() {
-    not exists(getParent())
-  }
+  predicate isRoot() { not exists(getParent()) }
 
   /**
    * Holds if this is the export namespace of a module.
@@ -81,9 +71,7 @@ class CanonicalName extends @symbol {
   /**
    * Holds if this is the export namespace of the given module.
    */
-  predicate isModuleRoot(StmtContainer mod) {
-    ast_node_symbol(mod, this)
-  }
+  predicate isModuleRoot(StmtContainer mod) { ast_node_symbol(mod, this) }
 
   /**
    * Holds if this canonical name is exported by its parent.
@@ -91,17 +79,16 @@ class CanonicalName extends @symbol {
    * Some entities, such as type parameters, have canonical names that are not
    * available through qualified name access.
    */
-  predicate isExportedMember() {
-    this instanceof @member_symbol
-  }
+  predicate isExportedMember() { this instanceof @member_symbol }
 
   /** Holds if this has the given qualified name, rooted in the global scope. */
   predicate hasQualifiedName(string globalName) {
     globalName = getGlobalName()
     or
-    exists (string prefix |
+    exists(string prefix |
       getParent().hasQualifiedName(prefix) and
-      globalName = prefix + "." + getName())
+      globalName = prefix + "." + getName()
+    )
   }
 
   /** Holds if this has the given qualified name, rooted in the given external module. */
@@ -109,23 +96,27 @@ class CanonicalName extends @symbol {
     moduleName = getParent().getExternalModuleName() and
     exportedName = getName()
     or
-    exists (string prefix |
+    exists(string prefix |
       getParent().hasQualifiedName(moduleName, prefix) and
-      exportedName = prefix + "." + getName())
+      exportedName = prefix + "." + getName()
+    )
   }
 
   /**
    * Gets the qualified name without the root.
    */
   string getRelativeName() {
-    if getParent().isModuleRoot() then
-      result = getName()
-    else if exists(getGlobalName()) then
-      result = min(getGlobalName())
-    else if exists(getParent()) then
-      result = getParent().getRelativeName() + "." + getName()
+    if getParent().isModuleRoot()
+    then result = getName()
     else
-      (not isModuleRoot() and result = getName())
+      if exists(getGlobalName())
+      then result = min(getGlobalName())
+      else
+        if exists(getParent())
+        then result = getParent().getRelativeName() + "." + getName()
+        else (
+          not isModuleRoot() and result = getName()
+        )
   }
 
   /**
@@ -135,20 +126,20 @@ class CanonicalName extends @symbol {
    * this is the container where the type is declared.
    */
   Scope getRootScope() {
-    exists (CanonicalName root | root = getRootName() |
-      if exists(root.getModule()) then
-        result = root.getModule().getScope()
-      else if exists(root.getGlobalName()) then
-        result instanceof GlobalScope
+    exists(CanonicalName root | root = getRootName() |
+      if exists(root.getModule())
+      then result = root.getModule().getScope()
       else
-        result = getADefinitionNode().getContainer().getScope())
+        if exists(root.getGlobalName())
+        then result instanceof GlobalScope
+        else result = getADefinitionNode().getContainer().getScope()
+    )
   }
 
   private CanonicalName getRootName() {
-    if exists(getGlobalName()) or isModuleRoot() or not exists(getParent()) then
-      result = this
-    else
-      result = getParent().getRootName()
+    if exists(getGlobalName()) or isModuleRoot() or not exists(getParent())
+    then result = this
+    else result = getParent().getRootName()
   }
 
   private ExprOrStmt getADefinitionNode() {
@@ -160,21 +151,28 @@ class CanonicalName extends @symbol {
    * Gets a string describing the root scope of this canonical name.
    */
   string describeRoot() {
-    exists (CanonicalName root | root = getRootName() |
-      if exists(root.getExternalModuleName()) then
-        result = "module '" + min(root.getExternalModuleName()) + "'"
-      else if exists(root.getModule().getFile().getRelativePath()) then
-        result = root.getModule().getFile().getRelativePath()
-      else if exists(root.getGlobalName()) then
-        result = "global scope"
-      else if exists(root.getADefinitionNode()) then
-        exists (StmtContainer container | container = root.getADefinitionNode().getContainer() |
-          result = container.(TopLevel).getFile().getRelativePath()
-          or
-          not container instanceof TopLevel and
-          result = container.getLocation().toString())
+    exists(CanonicalName root | root = getRootName() |
+      if exists(root.getExternalModuleName())
+      then result = "module '" + min(root.getExternalModuleName()) + "'"
       else
-        result = "unknown scope")
+        if exists(root.getModule().getFile().getRelativePath())
+        then result = root.getModule().getFile().getRelativePath()
+        else
+          if exists(root.getGlobalName())
+          then result = "global scope"
+          else
+            if exists(root.getADefinitionNode())
+            then
+              exists(StmtContainer container |
+                container = root.getADefinitionNode().getContainer()
+              |
+                result = container.(TopLevel).getFile().getRelativePath()
+                or
+                not container instanceof TopLevel and
+                result = container.getLocation().toString()
+              )
+            else result = "unknown scope"
+    )
   }
 
   /**
@@ -193,10 +191,9 @@ class CanonicalName extends @symbol {
    * ```
    */
   string toString() {
-    if isModuleRoot() then
-      result = describeRoot()
-    else
-      result = getRelativeName() + " in " + describeRoot()
+    if isModuleRoot()
+    then result = describeRoot()
+    else result = getRelativeName() + " in " + describeRoot()
   }
 }
 
@@ -205,46 +202,36 @@ class CanonicalName extends @symbol {
  */
 class TypeName extends CanonicalName {
   TypeName() {
-    exists (TypeReference ref | type_symbol(ref, this)) or
-    exists (TypeDefinition def | ast_node_symbol(def, this))
+    exists(TypeReference ref | type_symbol(ref, this)) or
+    exists(TypeDefinition def | ast_node_symbol(def, this))
   }
 
   /**
    * Gets a definition of the type with this canonical name, if any.
    */
-  TypeDefinition getADefinition() {
-    ast_node_symbol(result, this)
-  }
+  TypeDefinition getADefinition() { ast_node_symbol(result, this) }
 
   /**
    * Gets a type annotation that refers to this type name.
    */
-  TypeAccess getAnAccess() {
-    result.getTypeName() = this
-  }
+  TypeAccess getAnAccess() { result.getTypeName() = this }
 
   /**
    * Gets a type that refers to this canonical name.
    */
-  TypeReference getATypeReference() {
-    result.getTypeName() = this
-  }
+  TypeReference getATypeReference() { result.getTypeName() = this }
 
   /**
    * DEPRECATED. Use `getRelativeName()` or `hasQualifiedName()` instead.
    *
    * Gets the qualified name without the root.
    */
-  deprecated string getQualifiedName() {
-    result = getRelativeName()
-  }
+  deprecated string getQualifiedName() { result = getRelativeName() }
 
   /**
    * Gets a type named in the `extends` or `implements` clause of this type.
    */
-  TypeName getABaseTypeName() {
-    base_type_names(this, result)
-  }
+  TypeName getABaseTypeName() { base_type_names(this, result) }
 
   /**
    * Gets the "self type" that refers to this canonical name.
@@ -255,9 +242,7 @@ class TypeName extends CanonicalName {
    * For example, the "self type" of `Array` is `Array<T>`, where `T` refers to the
    * type parameter declared on the `Array` type.
    */
-  TypeReference getType() {
-    self_types(this, result)
-  }
+  TypeReference getType() { self_types(this, result) }
 }
 
 /**
@@ -266,32 +251,26 @@ class TypeName extends CanonicalName {
 class Namespace extends CanonicalName {
   Namespace() {
     getAChild().isExportedMember() or
-    exists (NamespaceDefinition def | ast_node_symbol(def, this)) or
-    exists (NamespaceAccess ref | ast_node_symbol(ref, this))
+    exists(NamespaceDefinition def | ast_node_symbol(def, this)) or
+    exists(NamespaceAccess ref | ast_node_symbol(ref, this))
   }
 
   /**
    * Gets a definition of the type with this canonical name, if any.
    */
-  NamespaceDefinition getADefinition() {
-    ast_node_symbol(result, this)
-  }
+  NamespaceDefinition getADefinition() { ast_node_symbol(result, this) }
 
   /**
    * Gets a part of a type annotation that refers to this namespace.
    */
-  NamespaceAccess getAnAccess() {
-    result.getNamespace() = this
-  }
+  NamespaceAccess getAnAccess() { result.getNamespace() = this }
 
   /**
    * DEPRECATED. Use `getRelativeName()` or `hasQualifiedName()` instead.
    *
    * Gets the qualified name without the root.
    */
-  deprecated string getQualifiedName() {
-    result = getRelativeName()
-  }
+  deprecated string getQualifiedName() { result = getRelativeName() }
 
   /** Gets a namespace nested in this one. */
   Namespace getNamespaceMember(string name) {
@@ -318,9 +297,7 @@ class Namespace extends CanonicalName {
    *
    * Namespaces defined by enum declarations have no exporting containers.
    */
-  StmtContainer getAnExportingContainer() {
-    ast_node_symbol(result, this)
-  }
+  StmtContainer getAnExportingContainer() { ast_node_symbol(result, this) }
 }
 
 /**
@@ -328,21 +305,17 @@ class Namespace extends CanonicalName {
  */
 class CanonicalFunctionName extends CanonicalName {
   CanonicalFunctionName() {
-    exists (Function fun | ast_node_symbol(fun, this)) or
-    exists (InvokeExpr invoke | ast_node_symbol(invoke, this))
+    exists(Function fun | ast_node_symbol(fun, this)) or
+    exists(InvokeExpr invoke | ast_node_symbol(invoke, this))
   }
 
   /**
    * Gets a function with this canonical name.
    */
-  Function getADefinition() {
-    ast_node_symbol(result, this)
-  }
+  Function getADefinition() { ast_node_symbol(result, this) }
 
   /**
    * Gets the implementation of this function, if it exists.
    */
-  Function getImplementation() {
-    result = getADefinition() and result.hasBody()
-  }
+  Function getImplementation() { result = getADefinition() and result.hasBody() }
 }
diff --git a/javascript/ql/src/semmle/javascript/Classes.qll b/javascript/ql/src/semmle/javascript/Classes.qll
index cfdb16b76cf4..11159344ccac 100644
--- a/javascript/ql/src/semmle/javascript/Classes.qll
+++ b/javascript/ql/src/semmle/javascript/Classes.qll
@@ -15,19 +15,13 @@ class ClassOrInterface extends @classorinterface, TypeParameterized {
   Identifier getIdentifier() { none() } // Overridden in subtypes.
 
   /** Gets the name of the defined class or interface, if any. */
-  string getName() {
-    result = getIdentifier().getName()
-  }
+  string getName() { result = getIdentifier().getName() }
 
   /** Gets the nearest enclosing function or toplevel in which this class or interface occurs. */
-  StmtContainer getContainer() {
-    result = this.(ExprOrStmt).getContainer()
-  }
+  StmtContainer getContainer() { result = this.(ExprOrStmt).getContainer() }
 
   /** Gets a member declared in this class or interface. */
-  MemberDeclaration getAMember() {
-    result.getDeclaringType() = this
-  }
+  MemberDeclaration getAMember() { result.getDeclaringType() = this }
 
   /** Gets the member with the given name declared in this class or interface. */
   MemberDeclaration getMember(string name) {
@@ -36,34 +30,22 @@ class ClassOrInterface extends @classorinterface, TypeParameterized {
   }
 
   /** Gets a method declared in this class or interface. */
-  MethodDeclaration getAMethod() {
-    result = getAMember()
-  }
+  MethodDeclaration getAMethod() { result = getAMember() }
 
   /** Gets the method with the given name declared in this class or interface. */
-  MethodDeclaration getMethod(string name) {
-    result = getMember(name)
-  }
+  MethodDeclaration getMethod(string name) { result = getMember(name) }
 
   /** Gets a field declared in this class or interface. */
-  FieldDeclaration getAField() {
-    result = getAMember()
-  }
+  FieldDeclaration getAField() { result = getAMember() }
 
   /** Gets the field with the given name declared in this class or interface. */
-  FieldDeclaration getField(string name) {
-    result = getMember(name)
-  }
+  FieldDeclaration getField(string name) { result = getMember(name) }
 
   /** Gets a call signature declared in this interface. */
-  CallSignature getACallSignature() {
-    result = getAMember()
-  }
+  CallSignature getACallSignature() { result = getAMember() }
 
   /** Gets an index signature declared in this interface. */
-  IndexSignature getAnIndexSignature() {
-    result = getAMember()
-  }
+  IndexSignature getAnIndexSignature() { result = getAMember() }
 
   /**
    * Gets the expression denoting the super class of this class,
@@ -85,9 +67,7 @@ class ClassOrInterface extends @classorinterface, TypeParameterized {
   /**
    * Holds if this is an interface or a class declared with the `abstract` modifier.
    */
-  predicate isAbstract() {
-    none()
-  }
+  predicate isAbstract() { none() }
 
   /**
    * Gets a description of this class or interface.
@@ -104,9 +84,7 @@ class ClassOrInterface extends @classorinterface, TypeParameterized {
    *
    * Anonymous classes and interfaces do not have a canonical name.
    */
-  TypeName getTypeName() {
-    result.getADefinition() = this
-  }
+  TypeName getTypeName() { result.getADefinition() = this }
 }
 
 /**
@@ -115,35 +93,31 @@ class ClassOrInterface extends @classorinterface, TypeParameterized {
  */
 class ClassDefinition extends @classdefinition, ClassOrInterface, AST::ValueNode {
   /** Gets the variable holding this class. */
-  Variable getVariable() {
-    result = getIdentifier().getVariable()
-  }
+  Variable getVariable() { result = getIdentifier().getVariable() }
 
   /** Gets the identifier naming the defined class, if any. */
-  override VarDecl getIdentifier() {
-    result = getChildExpr(0)
-  }
+  override VarDecl getIdentifier() { result = getChildExpr(0) }
 
   override TypeParameter getTypeParameter(int i) {
     // AST indices for type parameters: -3, -6, -9, ...
-    exists (int astIndex | typeexprs(result, _, this, astIndex, _) | astIndex <= -3 and astIndex % 3 = 0 and i = -(astIndex + 3) / 3)
+    exists(int astIndex | typeexprs(result, _, this, astIndex, _) |
+      astIndex <= -3 and astIndex % 3 = 0 and i = -(astIndex + 3) / 3
+    )
   }
 
   /** Gets the expression denoting the super class of the defined class, if any. */
-  override Expr getSuperClass() {
-    result = getChildExpr(1)
-  }
+  override Expr getSuperClass() { result = getChildExpr(1) }
 
   /** Gets the `n`th type from the `implements` clause of this class, starting at 0. */
   override TypeExpr getSuperInterface(int i) {
     // AST indices for super interfaces: -1, -4, -7, ...
-    exists (int astIndex | typeexprs(result, _, this, astIndex, _) | astIndex <= -1 and astIndex % 3 = -1 and i = -(astIndex + 1) / 3)
+    exists(int astIndex | typeexprs(result, _, this, astIndex, _) |
+      astIndex <= -1 and astIndex % 3 = -1 and i = -(astIndex + 1) / 3
+    )
   }
 
   /** Gets any type from the `implements` clause of this class. */
-  override TypeExpr getASuperInterface() {
-    result = ClassOrInterface.super.getASuperInterface()
-  }
+  override TypeExpr getASuperInterface() { result = ClassOrInterface.super.getASuperInterface() }
 
   /**
    * Gets the constructor of this class.
@@ -151,9 +125,7 @@ class ClassDefinition extends @classdefinition, ClassOrInterface, AST::ValueNode
    * Note that every class has a constructor: if no explicit constructor
    * is declared, it has a synthetic default constructor.
    */
-  ConstructorDeclaration getConstructor() {
-    result = getAMethod()
-  }
+  ConstructorDeclaration getConstructor() { result = getAMethod() }
 
   /**
    * Gets the `i`th decorator applied to this class.
@@ -163,7 +135,9 @@ class ClassDefinition extends @classdefinition, ClassOrInterface, AST::ValueNode
    */
   Decorator getDecorator(int i) {
     // AST indices for decorators: -2, -5, -8, ...
-    exists (int astIndex | exprs(result, _, this, astIndex, _) | astIndex <= -2 and astIndex % 3 = -2 and i = -(astIndex + 2) / 3)
+    exists(int astIndex | exprs(result, _, this, astIndex, _) |
+      astIndex <= -2 and astIndex % 3 = -2 and i = -(astIndex + 2) / 3
+    )
   }
 
   /**
@@ -172,22 +146,17 @@ class ClassDefinition extends @classdefinition, ClassOrInterface, AST::ValueNode
    * For example, the class `@A @B class C {}` has
    * decorators `@A` and `@B`.
    */
-  Decorator getADecorator() {
-    result = getDecorator(_)
-  }
+  Decorator getADecorator() { result = getDecorator(_) }
 
   /**
    * Holds if this class has the `abstract` modifier.
    */
-  override predicate isAbstract() {
-    isAbstractClass(this)
-  }
+  override predicate isAbstract() { isAbstractClass(this) }
 
   override string describe() {
-    if exists(inferNameFromVarDef()) then
-      result = inferNameFromVarDef()
-    else
-      result = "anonymous class"
+    if exists(inferNameFromVarDef())
+    then result = inferNameFromVarDef()
+    else result = "anonymous class"
   }
 
   /**
@@ -196,11 +165,12 @@ class ClassDefinition extends @classdefinition, ClassOrInterface, AST::ValueNode
    */
   private string inferNameFromVarDef() {
     // in ambiguous cases like `let C = class D {}`, prefer `D` to `C`
-    if exists(getName()) then
-      result = "class " + getName()
-    else exists (VarDef vd | this = vd.getSource() |
-      result = "class " + vd.getTarget().(VarRef).getName()
-    )
+    if exists(getName())
+    then result = "class " + getName()
+    else
+      exists(VarDef vd | this = vd.getSource() |
+        result = "class " + vd.getTarget().(VarRef).getName()
+      )
   }
 
   /**
@@ -209,7 +179,7 @@ class ClassDefinition extends @classdefinition, ClassOrInterface, AST::ValueNode
    * Note that constructors aren't considered instance methods.
    */
   Function getInstanceMethod(string name) {
-    exists (MemberDefinition mem | mem = getMember(name) |
+    exists(MemberDefinition mem | mem = getMember(name) |
       result = mem.getInit() and
       not mem.isStatic() and
       not mem instanceof ConstructorDefinition
@@ -222,7 +192,6 @@ class ClassDefinition extends @classdefinition, ClassOrInterface, AST::ValueNode
   ClassDefinition getSuperClassDefinition() {
     result = getSuperClass().analyze().getAValue().(AbstractClass).getClass()
   }
-
 }
 
 /**
@@ -233,9 +202,7 @@ class ClassDeclStmt extends @classdeclstmt, ClassDefinition, Stmt {
   override StmtContainer getContainer() { result = Stmt.super.getContainer() }
 
   override ControlFlowNode getFirstControlFlowNode() {
-    if hasDeclareKeyword(this)
-    then result = this
-    else result = getIdentifier()
+    if hasDeclareKeyword(this) then result = this else result = getIdentifier()
   }
 }
 
@@ -243,9 +210,7 @@ class ClassDeclStmt extends @classdeclstmt, ClassDefinition, Stmt {
  * A class expression.
  */
 class ClassExpr extends @classexpr, ClassDefinition, Expr {
-  override predicate isImpure() {
-    none()
-  }
+  override predicate isImpure() { none() }
 
   /** Gets the nearest enclosing function or toplevel in which this class expression occurs. */
   override StmtContainer getContainer() { result = Expr.super.getContainer() }
@@ -253,70 +218,64 @@ class ClassExpr extends @classexpr, ClassDefinition, Expr {
   override ControlFlowNode getFirstControlFlowNode() {
     if exists(getIdentifier())
     then result = getIdentifier()
-    else if exists(getSuperClass())
-    then result = getSuperClass().getFirstControlFlowNode()
-    else if exists(getClassInitializedMember())
-    then result = min(ClassInitializedMember m | m = getClassInitializedMember() | m order by m.getIndex())
-    else result = this
+    else
+      if exists(getSuperClass())
+      then result = getSuperClass().getFirstControlFlowNode()
+      else
+        if exists(getClassInitializedMember())
+        then
+          result = min(ClassInitializedMember m |
+              m = getClassInitializedMember()
+            |
+              m
+              order by
+                m.getIndex()
+            )
+        else result = this
   }
 
   /** Returns a member that is initialized during the creation of this class. */
-  private ClassInitializedMember getClassInitializedMember() {
-    result = getAMember()
-  }
+  private ClassInitializedMember getClassInitializedMember() { result = getAMember() }
 }
 
 /** Members that are initialized at class creation time (as opposed to instance creation time). */
 private class ClassInitializedMember extends MemberDeclaration {
-  ClassInitializedMember() {
-    this instanceof MethodDefinition or this.isStatic()
-  }
-  int getIndex() {
-    properties(this, _, result, _, _)
-  }
+  ClassInitializedMember() { this instanceof MethodDefinition or this.isStatic() }
+
+  int getIndex() { properties(this, _, result, _, _) }
 }
 
 /**
  * A `super` expression.
  */
 class SuperExpr extends @superexpr, Expr {
-  override predicate isImpure() {
-    none()
-  }
+  override predicate isImpure() { none() }
 
   /**
    * Gets the function whose `super` binding this expression refers to,
    * which is the nearest enclosing non-arrow function.
    */
-  Function getBinder() {
-    result = getEnclosingFunction().getThisBinder()
-  }
+  Function getBinder() { result = getEnclosingFunction().getThisBinder() }
 }
 
 /**
  * A `super(...)` call.
  */
 class SuperCall extends CallExpr {
-  SuperCall() {
-    getCallee().getUnderlyingValue() instanceof SuperExpr
-  }
+  SuperCall() { getCallee().getUnderlyingValue() instanceof SuperExpr }
 
   /**
    * Gets the function whose `super` binding this call refers to,
    * which is the nearest enclosing non-arrow function.
    */
-  Function getBinder() {
-    result = getCallee().getUnderlyingValue().(SuperExpr).getBinder()
-  }
+  Function getBinder() { result = getCallee().getUnderlyingValue().(SuperExpr).getBinder() }
 }
 
 /**
  * A property access on `super`.
  */
 class SuperPropAccess extends PropAccess {
-  SuperPropAccess() {
-    getBase().getUnderlyingValue() instanceof SuperExpr
-  }
+  SuperPropAccess() { getBase().getUnderlyingValue() instanceof SuperExpr }
 }
 
 /**
@@ -328,28 +287,20 @@ class SuperPropAccess extends PropAccess {
  *
  * See also ECMAScript 2015 Language Specification, Chapter 12.3.8.
  */
-class NewTargetExpr extends @newtargetexpr, Expr {
-  override predicate isImpure() {
-    none()
-  }
-}
+class NewTargetExpr extends @newtargetexpr, Expr { override predicate isImpure() { none() } }
 
 /**
  * A scope induced by a named class expression or class expression with type parameters.
  */
 class ClassExprScope extends @classexprscope, Scope {
-  override string toString() {
-    result = "class expression scope"
-  }
+  override string toString() { result = "class expression scope" }
 }
 
 /**
  * A scope induced by a class declaration with type parameters.
  */
 class ClassDeclScope extends @classdeclscope, Scope {
-  override string toString() {
-    result = "class declaration scope"
-  }
+  override string toString() { result = "class declaration scope" }
 }
 
 /**
@@ -368,24 +319,20 @@ class ClassDeclScope extends @classdeclscope, Scope {
 class MemberDeclaration extends @property, Documentable {
   MemberDeclaration() {
     // filter out property patterns and object properties and enum members
-    exists (ClassOrInterface cl | properties(this, cl, _, _, _))
+    exists(ClassOrInterface cl | properties(this, cl, _, _, _))
   }
 
   /**
    * Holds if this member is static.
    */
-  predicate isStatic() {
-    isStatic(this)
-  }
+  predicate isStatic() { isStatic(this) }
 
   /**
    * Holds if this member is abstract.
    *
    * Abstract members occur only in TypeScript.
    */
-  predicate isAbstract() {
-    isAbstractMember(this)
-  }
+  predicate isAbstract() { isAbstractMember(this) }
 
   /**
    * Holds if this member is public, either because it has no access modifier or
@@ -393,9 +340,7 @@ class MemberDeclaration extends @property, Documentable {
    *
    * Class members not declared in a TypeScript file are always considered public.
    */
-  predicate isPublic() {
-    not isPrivate() and not isProtected()
-  }
+  predicate isPublic() { not isPrivate() and not isProtected() }
 
   /**
    * Holds if this is a TypeScript member explicitly annotated with the `public` keyword.
@@ -405,63 +350,47 @@ class MemberDeclaration extends @property, Documentable {
   /**
    * Holds if this is a TypeScript member annotated with the `private` keyword.
    */
-  predicate isPrivate() {
-    hasPrivateKeyword(this)
-  }
+  predicate isPrivate() { hasPrivateKeyword(this) }
 
   /**
    * Holds if this is a TypeScript member annotated with the `protected` keyword.
    */
-  predicate isProtected() {
-    hasProtectedKeyword(this)
-  }
+  predicate isProtected() { hasProtectedKeyword(this) }
 
   /**
    * Gets the expression specifying the name of this member,
    * or nothing if this is a call signature.
    */
-  Expr getNameExpr() {
-    result = getChildExpr(0)
-  }
+  Expr getNameExpr() { result = getChildExpr(0) }
 
   /**
    * Gets the expression specifying the initial value of the member;
    * for methods and constructors this is always a function, for fields
    * it may not be defined.
    */
-  Expr getInit() {
-    result = getChildExpr(1)
-  }
+  Expr getInit() { result = getChildExpr(1) }
 
   /** Gets the name of this member. */
   string getName() {
-    result = getNameExpr().(Literal).getValue() or
+    result = getNameExpr().(Literal).getValue()
+    or
     not isComputed() and result = getNameExpr().(Identifier).getName()
   }
 
   /** Holds if the name of this member is computed. */
-  predicate isComputed() {
-    isComputed(this)
-  }
+  predicate isComputed() { isComputed(this) }
 
   /** Gets the class or interface this member belongs to. */
-  ClassOrInterface getDeclaringType() {
-    properties(this, result, _, _, _)
-  }
+  ClassOrInterface getDeclaringType() { properties(this, result, _, _, _) }
 
   /** Gets the class this member belongs to, if any. */
-  ClassDefinition getDeclaringClass() {
-    properties(this, result, _, _, _)
-  }
+  ClassDefinition getDeclaringClass() { properties(this, result, _, _, _) }
+
   /** Gets the nearest enclosing function or toplevel in which this member occurs. */
-  StmtContainer getContainer() {
-    result = getDeclaringType().getContainer()
-  }
+  StmtContainer getContainer() { result = getDeclaringType().getContainer() }
 
   /** Holds if the name of this member is computed by an impure expression. */
-  predicate hasImpureNameExpr() {
-    isComputed() and getNameExpr().isImpure()
-  }
+  predicate hasImpureNameExpr() { isComputed() and getNameExpr().isImpure() }
 
   /**
    * Gets the `i`th decorator applied to this member.
@@ -469,9 +398,7 @@ class MemberDeclaration extends @property, Documentable {
    * For example, a method of the form `@A @B m() { ... }` has
    * `@A` as its 0th decorator and `@B` as its first decorator.
    */
-  Decorator getDecorator(int i) {
-    result = getChildExpr(-(i+1))
-  }
+  Decorator getDecorator(int i) { result = getChildExpr(-(i + 1)) }
 
   /**
    * Gets a decorator applied to this member.
@@ -479,13 +406,9 @@ class MemberDeclaration extends @property, Documentable {
    * For example, a method of the form `@A @B m() { ... }` has
    * decorators `@A` and `@B`.
    */
-  Decorator getADecorator() {
-    result = getDecorator(_)
-  }
+  Decorator getADecorator() { result = getDecorator(_) }
 
-  override string toString() {
-    properties(this, _, _, _, result)
-  }
+  override string toString() { properties(this, _, _, _, result) }
 
   override ControlFlowNode getFirstControlFlowNode() {
     result = getNameExpr().getFirstControlFlowNode()
@@ -503,28 +426,18 @@ class MemberDeclaration extends @property, Documentable {
   /**
    * True if this is abstract, ambient, or an overload signature.
    */
-  predicate isSignature() {
-    not isConcrete()
-  }
+  predicate isSignature() { not isConcrete() }
 }
 
 /**
  * A concrete member of a class, that is, a non-abstract, non-ambient field or method with a body.
  */
-class MemberDefinition extends MemberDeclaration {
-  MemberDefinition() {
-    isConcrete()
-  }
-}
+class MemberDefinition extends MemberDeclaration { MemberDefinition() { isConcrete() } }
 
 /**
  * A member signature declared in a class or interface, that is, an abstract or ambient field or method without a function body.
  */
-class MemberSignature extends MemberDeclaration {
-  MemberSignature() {
-    isSignature()
-  }
-}
+class MemberSignature extends MemberDeclaration { MemberSignature() { isSignature() } }
 
 /**
  * A method declaration in a class or interface, either a concrete definition or a signature without a body.
@@ -532,157 +445,129 @@ class MemberSignature extends MemberDeclaration {
  * Note that TypeScript call signatures are not considered methods.
  */
 class MethodDeclaration extends MemberDeclaration {
-  MethodDeclaration() {
-    isMethod(this)
-  }
+  MethodDeclaration() { isMethod(this) }
 
   /**
    * Gets the body of this method.
    */
-  FunctionExpr getBody() {
-    result = getChildExpr(1)
-  }
+  FunctionExpr getBody() { result = getChildExpr(1) }
 }
 
 /**
  * A concrete method definition in a class.
  */
-class MethodDefinition extends MethodDeclaration, MemberDefinition {
-}
+class MethodDefinition extends MethodDeclaration, MemberDefinition { }
 
 /**
  * A method signature declared in a class or interface, that is, a method without a function body.
  *
  * Note that TypeScript call signatures are not considered method signatures.
  */
-class MethodSignature extends MethodDeclaration, MemberSignature {
-}
+class MethodSignature extends MethodDeclaration, MemberSignature { }
 
 /**
  * A constructor declaration in a class, either a concrete definition or a signature without a body.
  */
 class ConstructorDeclaration extends MethodDeclaration {
   ConstructorDeclaration() {
-    not isComputed() and not isStatic() and
+    not isComputed() and
+    not isStatic() and
     getName() = "constructor"
   }
 
   /** Holds if this is a synthetic default constructor. */
-  predicate isSynthetic() {
-    getLocation().isEmpty()
-  }
+  predicate isSynthetic() { getLocation().isEmpty() }
 }
 
 /**
  * The concrete constructor definition of a class, possibly a synthetic constructor if the class
  * did not declare any constructors.
  */
-class ConstructorDefinition extends ConstructorDeclaration, MethodDefinition {}
+class ConstructorDefinition extends ConstructorDeclaration, MethodDefinition { }
 
 /**
  * A constructor signature declared in a class, that is, a constructor without a function body.
  */
-class ConstructorSignature extends ConstructorDeclaration, MethodSignature {}
+class ConstructorSignature extends ConstructorDeclaration, MethodSignature { }
 
 /**
  * A function generated by the extractor to implement a synthetic default constructor.
  */
 class SyntheticConstructor extends Function {
-  SyntheticConstructor() {
-    this = any(ConstructorDeclaration cd | cd.isSynthetic() | cd.getBody())
-  }
+  SyntheticConstructor() { this = any(ConstructorDeclaration cd | cd.isSynthetic() | cd.getBody()) }
 }
 
 /**
  * An accessor method declaration in a class or interface, either a concrete definition or a signature without a body.
  */
-abstract class AccessorMethodDeclaration extends MethodDeclaration {
-}
+abstract class AccessorMethodDeclaration extends MethodDeclaration { }
 
 /**
  * A concrete accessor method definition in a class, that is, an accessor method with a function body.
  */
-abstract class AccessorMethodDefinition extends MethodDefinition, AccessorMethodDeclaration {
-}
+abstract class AccessorMethodDefinition extends MethodDefinition, AccessorMethodDeclaration { }
 
 /**
  * An accessor method signature declared in a class or interface, that is, an accessor method without a function body.
  */
-abstract class AccessorMethodSignature extends MethodSignature, AccessorMethodDeclaration {
-}
+abstract class AccessorMethodSignature extends MethodSignature, AccessorMethodDeclaration { }
 
 /**
  * A getter method declaration in a class or interface, either a concrete definition or a signature without a function body.
  */
-class GetterMethodDeclaration extends AccessorMethodDeclaration, @property_getter {
-}
+class GetterMethodDeclaration extends AccessorMethodDeclaration, @property_getter { }
 
 /**
  * A concrete getter method definition in a class, that is, a getter method with a function body.
  */
-class GetterMethodDefinition extends GetterMethodDeclaration, AccessorMethodDefinition {
-}
+class GetterMethodDefinition extends GetterMethodDeclaration, AccessorMethodDefinition { }
 
 /**
  * A getter method signature declared in a class or interface, that is, a getter method without a function body.
  */
-class GetterMethodSignature extends GetterMethodDeclaration, AccessorMethodSignature {
-}
+class GetterMethodSignature extends GetterMethodDeclaration, AccessorMethodSignature { }
 
 /**
  * A setter method declaration in a class or interface, either a concrete definition or a signature without a body.
  */
-class SetterMethodDeclaration extends AccessorMethodDeclaration, @property_setter {
-}
+class SetterMethodDeclaration extends AccessorMethodDeclaration, @property_setter { }
 
 /**
  * A concrete setter method definition in a class, that is, a setter method with a function body
  */
-class SetterMethodDefinition extends SetterMethodDeclaration, AccessorMethodDefinition {
-}
+class SetterMethodDefinition extends SetterMethodDeclaration, AccessorMethodDefinition { }
 
 /**
  * A setter method signature declared in a class or interface, that is, a setter method without a function body.
  */
-class SetterMethodSignature extends SetterMethodDeclaration, AccessorMethodSignature {
-}
+class SetterMethodSignature extends SetterMethodDeclaration, AccessorMethodSignature { }
 
 /**
  * A field declaration in a class or interface, either a concrete definition or an abstract or ambient field signature.
  */
 class FieldDeclaration extends MemberDeclaration, @field {
   /** Gets the type annotation of this field, if any, such as `T` in `{ x: T }`. */
-  TypeExpr getTypeAnnotation() {
-    result = getChildTypeExpr(2)
-  }
+  TypeExpr getTypeAnnotation() { result = getChildTypeExpr(2) }
 
   /** Holds if this is a TypeScript field annotated with the `readonly` keyword. */
-  predicate isReadonly() {
-    hasReadonlyKeyword(this)
-  }
+  predicate isReadonly() { hasReadonlyKeyword(this) }
 
   /** Holds if this is a TypeScript field marked as optional with the `?` operator. */
-  predicate isOptional() {
-    isOptionalMember(this)
-  }
+  predicate isOptional() { isOptionalMember(this) }
 
   /** Holds if this is a TypeScript field marked as definitely assigned with the `!` operator. */
-  predicate hasDefiniteAssignmentAssertion() {
-    hasDefiniteAssignmentAssertion(this)
-  }
+  predicate hasDefiniteAssignmentAssertion() { hasDefiniteAssignmentAssertion(this) }
 }
 
 /**
  * A concrete field definition in a class.
  */
-class FieldDefinition extends FieldDeclaration, MemberDefinition {
-}
+class FieldDefinition extends FieldDeclaration, MemberDefinition { }
 
 /**
  * A field signature declared in a class or interface, that is, an abstract or ambient field declaration.
  */
-class FieldSignature extends FieldDeclaration, MemberSignature {
-}
+class FieldSignature extends FieldDeclaration, MemberSignature { }
 
 /**
  * A field induced by an initializing constructor parameter, such as the field `x` in:
@@ -695,18 +580,14 @@ class FieldSignature extends FieldDeclaration, MemberSignature {
 class ParameterField extends FieldDeclaration, @parameter_field {
   /** Gets the initializing constructor parameter from which this field was induced. */
   Parameter getParameter() {
-    exists (FunctionExpr constructor, int index |
-      parameter_fields(this, constructor, index) |
-      result = constructor.getParameter(index))
+    exists(FunctionExpr constructor, int index | parameter_fields(this, constructor, index) |
+      result = constructor.getParameter(index)
+    )
   }
 
-  override Expr getNameExpr() {
-    result = getParameter()
-  }
+  override Expr getNameExpr() { result = getParameter() }
 
-  override TypeExpr getTypeAnnotation() {
-    result = getParameter().getTypeAnnotation()
-  }
+  override TypeExpr getTypeAnnotation() { result = getParameter().getTypeAnnotation() }
 }
 
 /**
@@ -735,9 +616,7 @@ class CallSignature extends @call_signature, MemberSignature {
  * interface I { (x: number): string; }
  * ```
  */
-class FunctionCallSignature extends @function_call_signature, CallSignature {
-
-}
+class FunctionCallSignature extends @function_call_signature, CallSignature { }
 
 /**
  * A constructor call signature declared in an interface, such as in:
@@ -745,8 +624,7 @@ class FunctionCallSignature extends @function_call_signature, CallSignature {
  * interface I { new (x: string): Object; }
  * ```
  */
-class ConstructorCallSignature extends @constructor_call_signature, CallSignature {
-}
+class ConstructorCallSignature extends @constructor_call_signature, CallSignature { }
 
 /**
  * An index signature declared in an interface, such as in:
diff --git a/javascript/ql/src/semmle/javascript/Closure.qll b/javascript/ql/src/semmle/javascript/Closure.qll
index f180a79ac17f..616e7746d7c5 100644
--- a/javascript/ql/src/semmle/javascript/Closure.qll
+++ b/javascript/ql/src/semmle/javascript/Closure.qll
@@ -9,15 +9,13 @@ import javascript
  */
 class GoogFunctionCall extends CallExpr {
   GoogFunctionCall() {
-    exists (GlobalVariable gv | gv.getName() = "goog" |
+    exists(GlobalVariable gv | gv.getName() = "goog" |
       this.getCallee().(DotExpr).getBase() = gv.getAnAccess()
     )
   }
 
   /** Gets the name of the invoked function. */
-  string getFunctionName() {
-    result = getCallee().(DotExpr).getPropertyName()
-  }
+  string getFunctionName() { result = getCallee().(DotExpr).getPropertyName() }
 }
 
 /**
@@ -25,56 +23,38 @@ class GoogFunctionCall extends CallExpr {
  * in the `goog` namespace.
  */
 class GoogFunctionCallStmt extends ExprStmt {
-  GoogFunctionCallStmt() {
-    super.getExpr() instanceof GoogFunctionCall
-  }
+  GoogFunctionCallStmt() { super.getExpr() instanceof GoogFunctionCall }
 
-  override GoogFunctionCall getExpr() {
-    result = super.getExpr()
-  }
+  override GoogFunctionCall getExpr() { result = super.getExpr() }
 
   /** Gets the name of the invoked function. */
-  string getFunctionName() {
-    result = getExpr().getFunctionName()
-  }
+  string getFunctionName() { result = getExpr().getFunctionName() }
 
   /** Gets the `i`th argument to the invoked function. */
-  Expr getArgument(int i) {
-    result = getExpr().getArgument(i)
-  }
+  Expr getArgument(int i) { result = getExpr().getArgument(i) }
 
   /** Gets an argument to the invoked function. */
-  Expr getAnArgument() {
-    result = getArgument(_)
-  }
+  Expr getAnArgument() { result = getArgument(_) }
 }
 
 /**
  * A call to `goog.provide`.
  */
 class GoogProvide extends GoogFunctionCallStmt {
-  GoogProvide() {
-    getFunctionName() = "provide"
-  }
+  GoogProvide() { getFunctionName() = "provide" }
 
   /** Gets the identifier of the namespace created by this call. */
-  string getNamespaceId() {
-    result = getArgument(0).(ConstantString).getStringValue()
-  }
+  string getNamespaceId() { result = getArgument(0).(ConstantString).getStringValue() }
 }
 
 /**
  * A call to `goog.require`.
  */
 class GoogRequire extends GoogFunctionCallStmt {
-  GoogRequire() {
-    getFunctionName() = "require"
-  }
+  GoogRequire() { getFunctionName() = "require" }
 
   /** Gets the identifier of the namespace imported by this call. */
-  string getNamespaceId() {
-    result = getArgument(0).(ConstantString).getStringValue()
-  }
+  string getNamespaceId() { result = getArgument(0).(ConstantString).getStringValue() }
 }
 
 /**
@@ -88,12 +68,8 @@ class ClosureModule extends TopLevel {
   }
 
   /** Gets the identifier of a namespace required by this module. */
-  string getARequiredNamespace() {
-    result = getAChildStmt().(GoogRequire).getNamespaceId()
-  }
+  string getARequiredNamespace() { result = getAChildStmt().(GoogRequire).getNamespaceId() }
 
   /** Gets the identifer of a namespace provided by this module. */
-  string getAProvidedNamespace() {
-    result = getAChildStmt().(GoogProvide).getNamespaceId()
-  }
+  string getAProvidedNamespace() { result = getAChildStmt().(GoogProvide).getNamespaceId() }
 }
diff --git a/javascript/ql/src/semmle/javascript/Comments.qll b/javascript/ql/src/semmle/javascript/Comments.qll
index 3b7d9a315311..c478525fac59 100644
--- a/javascript/ql/src/semmle/javascript/Comments.qll
+++ b/javascript/ql/src/semmle/javascript/Comments.qll
@@ -4,60 +4,45 @@ import javascript
 
 /** A JavaScript source code comment. */
 class Comment extends @comment, Locatable {
-  override Location getLocation() {
-    hasLocation(this, result)
-  }
+  override Location getLocation() { hasLocation(this, result) }
 
   /** Gets the toplevel element this comment belongs to. */
-  TopLevel getTopLevel() {
-    comments(this, _, result, _, _)
-  }
+  TopLevel getTopLevel() { comments(this, _, result, _, _) }
 
   /** Gets the text of this comment, not including delimiters. */
-  string getText() {
-    comments(this, _, _, result, _)
-  }
+  string getText() { comments(this, _, _, result, _) }
 
   /** Gets the `i`th line of comment text. */
-  string getLine(int i) {
-    result = getText().splitAt("\n", i)
-  }
+  string getLine(int i) { result = getText().splitAt("\n", i) }
 
   /** Gets the next token after this comment. */
-  Token getNextToken() {
-    next_token(this, result)
-  }
+  Token getNextToken() { next_token(this, result) }
 
-  override int getNumLines() {
-    result = count(getLine(_))
-  }
+  override int getNumLines() { result = count(getLine(_)) }
 
-  override string toString() {
-    comments(this, _, _, _, result)
-  }
+  override string toString() { comments(this, _, _, _, result) }
 
   /** Holds if this comment spans lines `start` to `end` (inclusive) in file `f`. */
   predicate onLines(File f, int start, int end) {
-    exists (Location loc | loc = getLocation() |
+    exists(Location loc | loc = getLocation() |
       f = loc.getFile() and
       start = loc.getStartLine() and
       end = loc.getEndLine()
     )
   }
-
 }
 
 /** A line comment, that is, either an HTML comment or a `//` comment. */
-class LineComment extends @linecomment, Comment {}
+class LineComment extends @linecomment, Comment { }
 
 /** An HTML comment start/end token interpreted as a line comment. */
-class HtmlLineComment extends @htmlcomment, LineComment {}
+class HtmlLineComment extends @htmlcomment, LineComment { }
 
 /** An HTML comment start token interpreted as a line comment. */
-class HtmlCommentStart extends @htmlcommentstart, HtmlLineComment {}
+class HtmlCommentStart extends @htmlcommentstart, HtmlLineComment { }
 
 /** An HTML comment end token interpreted as a line comment. */
-class HtmlCommentEnd extends @htmlcommentend, HtmlLineComment {}
+class HtmlCommentEnd extends @htmlcommentend, HtmlLineComment { }
 
 /** DERECATED: Use `HtmlLineComment` instead. */
 deprecated class HTMLComment = HtmlLineComment;
@@ -69,13 +54,13 @@ deprecated class HTMLCommentStart = HtmlCommentStart;
 deprecated class HTMLCommentEnd = HtmlCommentEnd;
 
 /** A `//` comment. */
-class SlashSlashComment extends @slashslashcomment, LineComment {}
+class SlashSlashComment extends @slashslashcomment, LineComment { }
 
 /** A block comment (which may be a JSDoc comment). */
-class BlockComment extends @blockcomment, Comment {}
+class BlockComment extends @blockcomment, Comment { }
 
 /** A C-style block comment which is not a JSDoc comment. */
-class SlashStarComment extends @slashstarcomment, BlockComment {}
+class SlashStarComment extends @slashstarcomment, BlockComment { }
 
 /** A JSDoc comment. */
-class DocComment extends @doccomment, BlockComment {}
\ No newline at end of file
+class DocComment extends @doccomment, BlockComment { }
diff --git a/javascript/ql/src/semmle/javascript/Concepts.qll b/javascript/ql/src/semmle/javascript/Concepts.qll
index 0aff9a5904ed..e0654cd3c9f3 100644
--- a/javascript/ql/src/semmle/javascript/Concepts.qll
+++ b/javascript/ql/src/semmle/javascript/Concepts.qll
@@ -25,7 +25,6 @@ abstract class SystemCommandExecution extends DataFlow::Node {
  * A data flow node that performs a file system access (read, write, copy, permissions, stats, etc).
  */
 abstract class FileSystemAccess extends DataFlow::Node {
-
   /** Gets an argument to this file system access that is interpreted as a path. */
   abstract DataFlow::Node getAPathArgument();
 
@@ -43,28 +42,22 @@ abstract class FileSystemAccess extends DataFlow::Node {
  * A data flow node that reads data from the file system.
  */
 abstract class FileSystemReadAccess extends FileSystemAccess {
-
   /** Gets a node that represents data from the file system. */
   abstract DataFlow::Node getADataNode();
-
 }
 
 /**
  * A data flow node that writes data to the file system.
  */
 abstract class FileSystemWriteAccess extends FileSystemAccess {
-
   /** Gets a node that represents data to be written to the file system. */
   abstract DataFlow::Node getADataNode();
-
 }
 
 /**
  * A data flow node that contains a file name or an array of file names from the local file system.
  */
-abstract class FileNameSource extends DataFlow::Node {
-
-}
+abstract class FileNameSource extends DataFlow::Node { }
 
 /**
  * A data flow node that performs a database access.
@@ -78,22 +71,18 @@ abstract class DatabaseAccess extends DataFlow::Node {
  * A data flow node that reads persistent data.
  */
 abstract class PersistentReadAccess extends DataFlow::Node {
-
   /**
    * Gets a corresponding persistent write, if any.
    */
   abstract PersistentWriteAccess getAWrite();
-
 }
 
 /**
  * A data flow node that writes persistent data.
  */
 abstract class PersistentWriteAccess extends DataFlow::Node {
-
   /**
    * Gets the data flow node corresponding to the written value.
    */
   abstract DataFlow::Node getValue();
-
 }
diff --git a/javascript/ql/src/semmle/javascript/Constants.qll b/javascript/ql/src/semmle/javascript/Constants.qll
index 49fb06f45a96..32b7af41118c 100644
--- a/javascript/ql/src/semmle/javascript/Constants.qll
+++ b/javascript/ql/src/semmle/javascript/Constants.qll
@@ -7,21 +7,16 @@ import javascript
 /**
  * An expression that evaluates to a constant primitive value.
  */
-abstract class ConstantExpr extends Expr {
-
-}
+abstract class ConstantExpr extends Expr { }
 
 /**
  * Provides classes for expressions that evaluate to constant values according to a bottom-up syntactic analysis.
  */
 module SyntacticConstants {
-
   /**
    * An expression that evaluates to a constant value according to a bottom-up syntactic analysis.
    */
-  abstract class SyntacticConstant extends ConstantExpr {
-
-  }
+  abstract class SyntacticConstant extends ConstantExpr { }
 
   /**
    * A literal primitive expression.
@@ -29,139 +24,103 @@ module SyntacticConstants {
    * Note that `undefined`, `NaN` and `Infinity` are global variables, and are not covered by this class.
    */
   class PrimitiveLiteralConstant extends SyntacticConstant {
-
     PrimitiveLiteralConstant() {
-      this instanceof NumberLiteral or
-      this instanceof StringLiteral or
-      this instanceof BooleanLiteral or
+      this instanceof NumberLiteral
+      or
+      this instanceof StringLiteral
+      or
+      this instanceof BooleanLiteral
+      or
       exists(TemplateLiteral lit | lit = this |
-        lit.getNumChildExpr() = 0 or
+        lit.getNumChildExpr() = 0
+        or
         lit.getNumChildExpr() = 1 and
         lit.getElement(0) instanceof TemplateElement
       )
     }
-
   }
 
   /**
    * A literal null expression.
    */
-  class NullConstant extends SyntacticConstant, NullLiteral {
-
-  }
+  class NullConstant extends SyntacticConstant, NullLiteral { }
 
   /**
    * A unary operation on a syntactic constant.
    */
   class UnaryConstant extends SyntacticConstant, UnaryExpr {
-
-    UnaryConstant() {
-      getOperand() instanceof SyntacticConstant
-    }
-
+    UnaryConstant() { getOperand() instanceof SyntacticConstant }
   }
 
   /**
    * A binary operation on syntactic constants.
    */
   class BinaryConstant extends SyntacticConstant, BinaryExpr {
-
     BinaryConstant() {
       getLeftOperand() instanceof SyntacticConstant and
       getRightOperand() instanceof SyntacticConstant
     }
-
   }
 
   /**
    * A conditional expression on syntactic constants.
    */
   class ConditionalConstant extends SyntacticConstant, ConditionalExpr {
-
     ConditionalConstant() {
       getCondition() instanceof SyntacticConstant and
       getConsequent() instanceof SyntacticConstant and
       getAlternate() instanceof SyntacticConstant
     }
-
   }
 
   /**
    * A use of the global variable `undefined` or `void e`.
    */
   class UndefinedConstant extends SyntacticConstant {
-
     UndefinedConstant() {
       this.(GlobalVarAccess).getName() = "undefined" or
       this instanceof VoidExpr
     }
-
   }
 
-
   /**
    * A use of the global variable `NaN`.
    */
   class NaNConstant extends SyntacticConstant {
-
-    NaNConstant() {
-      this.(GlobalVarAccess).getName() = "NaN"
-    }
-
+    NaNConstant() { this.(GlobalVarAccess).getName() = "NaN" }
   }
 
   /**
    * A use of the global variable `Infinity`.
    */
   class InfinityConstant extends SyntacticConstant {
-
-    InfinityConstant() {
-      this.(GlobalVarAccess).getName() = "Infinity"
-    }
-
+    InfinityConstant() { this.(GlobalVarAccess).getName() = "Infinity" }
   }
 
   /**
    * An expression that wraps the syntactic constant it evaluates to.
    */
   class WrappedConstant extends SyntacticConstant {
-
-    WrappedConstant() {
-      getUnderlyingValue() instanceof SyntacticConstant
-    }
-
+    WrappedConstant() { getUnderlyingValue() instanceof SyntacticConstant }
   }
 
   /**
    * Holds if `c` evaluates to `undefined`.
    */
-  predicate isUndefined(SyntacticConstant c) {
-    c.getUnderlyingValue() instanceof UndefinedConstant
-  }
+  predicate isUndefined(SyntacticConstant c) { c.getUnderlyingValue() instanceof UndefinedConstant }
 
   /**
    * Holds if `c` evaluates to `null`.
    */
-  predicate isNull(SyntacticConstant c) {
-    c.getUnderlyingValue() instanceof NullConstant
-  }
+  predicate isNull(SyntacticConstant c) { c.getUnderlyingValue() instanceof NullConstant }
 
   /**
    * Holds if `c` evaluates to `null` or `undefined`.
    */
-  predicate isNullOrUndefined(SyntacticConstant c) {
-    isUndefined(c) or isNull(c)
-  }
-
+  predicate isNullOrUndefined(SyntacticConstant c) { isUndefined(c) or isNull(c) }
 }
 
 /**
  * An expression that evaluates to a constant string.
  */
-class ConstantString extends ConstantExpr {
-
-  ConstantString() {
-    exists(getStringValue())
-  }
-
-}
+class ConstantString extends ConstantExpr { ConstantString() { exists(getStringValue()) } }
diff --git a/javascript/ql/src/semmle/javascript/DOM.qll b/javascript/ql/src/semmle/javascript/DOM.qll
index 899f561149f6..a9784af1445d 100644
--- a/javascript/ql/src/semmle/javascript/DOM.qll
+++ b/javascript/ql/src/semmle/javascript/DOM.qll
@@ -23,9 +23,7 @@ module DOM {
      * For example, the 0th (and only) attribute of `<a href="https://semmle.com">Semmle</a>`
      * is `href="https://semmle.com"`.
      */
-    AttributeDefinition getAttribute(int i) {
-      none()
-    }
+    AttributeDefinition getAttribute(int i) { none() }
 
     /**
      * Gets an attribute of this DOM element with name `name`.
@@ -41,9 +39,7 @@ module DOM {
     /**
      * Gets an attribute of this DOM element.
      */
-    AttributeDefinition getAnAttribute() {
-      result.getElement() = this
-    }
+    AttributeDefinition getAnAttribute() { result.getElement() = this }
 
     /**
      * Gets the parent element of this element.
@@ -54,10 +50,7 @@ module DOM {
      * Gets the root element (i.e. an element without a parent) in which this element is contained.
      */
     ElementDefinition getRoot() {
-      if not exists(getParent()) then
-        result = this
-      else
-        result = getParent().getRoot()
+      if not exists(getParent()) then result = this else result = getParent().getRoot()
     }
 
     /**
@@ -78,9 +71,7 @@ module DOM {
       result = this.(HTML::Element).getAttribute(i)
     }
 
-    override ElementDefinition getParent() {
-      result = this.(HTML::Element).getParent()
-    }
+    override ElementDefinition getParent() { result = this.(HTML::Element).getParent() }
   }
 
   /**
@@ -91,14 +82,9 @@ module DOM {
 
     override string getName() { result = this.(JSXElement).getName() }
 
-    override AttributeDefinition getAttribute(int i) {
-      result = this.(JSXElement).getAttribute(i)
-    }
-
-    override ElementDefinition getParent() {
-      result = this.(JSXElement).getJsxParent()
-    }
+    override AttributeDefinition getAttribute(int i) { result = this.(JSXElement).getAttribute(i) }
 
+    override ElementDefinition getParent() { result = this.(JSXElement).getJsxParent() }
   }
 
   /**
@@ -120,23 +106,17 @@ module DOM {
      * This is undefined for HTML elements, where the attribute value is not
      * computed but specified directly.
      */
-    DataFlow::Node getValueNode() {
-      none()
-    }
+    DataFlow::Node getValueNode() { none() }
 
     /**
      * Gets the value of this attribute, if it can be determined.
      */
-    string getStringValue() {
-      result = getValueNode().asExpr().getStringValue()
-    }
+    string getStringValue() { result = getValueNode().asExpr().getStringValue() }
 
     /**
      * Gets the DOM element this attribute belongs to.
      */
-    ElementDefinition getElement() {
-      this = result.getAttributeByName(_)
-    }
+    ElementDefinition getElement() { this = result.getAttributeByName(_) }
 
     /**
      * Holds if the value of this attribute might be a template value
@@ -145,7 +125,6 @@ module DOM {
     predicate mayHaveTemplateValue() {
       getStringValue().regexpMatch(Templating::getDelimiterMatchingRegexp())
     }
-
   }
 
   /**
@@ -153,8 +132,11 @@ module DOM {
    */
   private class HtmlAttributeDefinition extends AttributeDefinition, @xmlattribute {
     HtmlAttributeDefinition() { this instanceof HTML::Attribute }
+
     override string getName() { result = this.(HTML::Attribute).getName() }
+
     override string getStringValue() { result = this.(HTML::Attribute).getValue() }
+
     override ElementDefinition getElement() { result = this.(HTML::Attribute).getElement() }
   }
 
@@ -163,9 +145,13 @@ module DOM {
    */
   private class JsxAttributeDefinition extends AttributeDefinition, @jsx_attribute {
     JSXAttribute attr;
+
     JsxAttributeDefinition() { this = attr }
+
     override string getName() { result = attr.getName() }
+
     override DataFlow::Node getValueNode() { result = DataFlow::valueNode(attr.getValue()) }
+
     override ElementDefinition getElement() { result = attr.getElement() }
   }
 
@@ -174,9 +160,13 @@ module DOM {
    */
   class DocumentElementDefinition extends ElementDefinition {
     DocumentElementDefinition() { this.getName() = "html" }
+
     override string getName() { none() }
+
     override AttributeDefinition getAttribute(int i) { none() }
+
     override AttributeDefinition getAttributeByName(string name) { none() }
+
     override ElementDefinition getParent() { none() }
   }
 
@@ -184,16 +174,27 @@ module DOM {
    * Holds if the value of attribute `attr` is interpreted as a URL.
    */
   predicate isUrlValuedAttribute(AttributeDefinition attr) {
-    exists (string eltName, string attrName |
+    exists(string eltName, string attrName |
       eltName = attr.getElement().getName() and
-      attrName = attr.getName() |
-      (eltName = "script" or eltName = "iframe" or eltName = "embed" or
-       eltName = "video" or eltName = "audio" or eltName = "source" or
-       eltName = "track") and
+      attrName = attr.getName()
+    |
+      (
+        eltName = "script" or
+        eltName = "iframe" or
+        eltName = "embed" or
+        eltName = "video" or
+        eltName = "audio" or
+        eltName = "source" or
+        eltName = "track"
+      ) and
       attrName = "src"
       or
-      (eltName = "link" or eltName = "a" or eltName = "base" or
-       eltName = "area") and
+      (
+        eltName = "link" or
+        eltName = "a" or
+        eltName = "base" or
+        eltName = "area"
+      ) and
       attrName = "href"
       or
       eltName = "form" and
@@ -212,24 +213,16 @@ module DOM {
     ElementDefinition defn;
 
     /** Gets the definition of this element. */
-    ElementDefinition getDefinition() {
-      result = defn
-    }
+    ElementDefinition getDefinition() { result = defn }
 
     /** Gets the tag name of this DOM element. */
-    string getName() {
-      result = defn.getName()
-    }
+    string getName() { result = defn.getName() }
 
     /** Gets the `i`th attribute of this DOM element, if it can be determined. */
-    AttributeDefinition getAttribute(int i) {
-      result = defn.getAttribute(i)
-    }
+    AttributeDefinition getAttribute(int i) { result = defn.getAttribute(i) }
 
     /** Gets an attribute of this DOM element with the given `name`. */
-    AttributeDefinition getAttributeByName(string name) {
-      result = defn.getAttributeByName(name)
-    }
+    AttributeDefinition getAttributeByName(string name) { result = defn.getAttributeByName(name) }
   }
 
   /**
@@ -240,7 +233,7 @@ module DOM {
     DefaultElement() {
       defn = this
       or
-      exists (Element that |
+      exists(Element that |
         this.(Expr).flow().getALocalSource().asExpr() = that and
         defn = that.getDefinition()
       )
@@ -252,7 +245,7 @@ module DOM {
    */
   predicate isInvalidHtmlIdAttributeValue(DOM::AttributeDefinition attr, string reason) {
     attr.getName() = "id" and
-    exists (string v | v = attr.getStringValue() |
+    exists(string v | v = attr.getStringValue() |
       v = "" and
       reason = "must contain at least one character"
       or
@@ -260,5 +253,4 @@ module DOM {
       reason = "must not contain any space characters"
     )
   }
-
 }
diff --git a/javascript/ql/src/semmle/javascript/DataFlow.qll b/javascript/ql/src/semmle/javascript/DataFlow.qll
index f525bdbded77..d991ed244c48 100644
--- a/javascript/ql/src/semmle/javascript/DataFlow.qll
+++ b/javascript/ql/src/semmle/javascript/DataFlow.qll
@@ -53,16 +53,14 @@ deprecated class DataFlowNode extends @dataflownode {
    * Gets another flow node from which data may flow to this node in one step,
    * either locally or non-locally.
    */
-  DataFlowNode flowPred() {
-    result = localFlowPred() or result = nonLocalFlowPred()
-  }
+  DataFlowNode flowPred() { result = localFlowPred() or result = nonLocalFlowPred() }
 
   /**
    * Gets a source flow node (that is, a node without a `localFlowPred()`) from which data
    * may flow to this node in zero or more local steps.
    */
-  cached deprecated
-  DataFlowNode getALocalSource() {
+  cached
+  deprecated DataFlowNode getALocalSource() {
     isLocalSource(result) and
     (
       result = this
@@ -76,10 +74,7 @@ deprecated class DataFlowNode extends @dataflownode {
    * may flow to this node in zero or more steps, considering both local and non-local flow.
    */
   DataFlowNode getASource() {
-    if exists(flowPred()) then
-      result = flowPred().getASource()
-    else
-      result = this
+    if exists(flowPred()) then result = flowPred().getASource() else result = this
   }
 
   /**
@@ -94,14 +89,10 @@ deprecated class DataFlowNode extends @dataflownode {
    * `p.getASource()` does _not_ return the corresponding argument, and
    * `p.isIncomplete("call")` holds.
    */
-  predicate isIncomplete(DataFlowIncompleteness cause) {
-    none()
-  }
+  predicate isIncomplete(DataFlowIncompleteness cause) { none() }
 
   /** Gets type inference results for this data flow node. */
-  DataFlow::AnalyzedNode analyze() {
-    result = DataFlow::valueNode(this).analyze()
-  }
+  DataFlow::AnalyzedNode analyze() { result = DataFlow::valueNode(this).analyze() }
 
   /** Gets a textual representation of this element. */
   string toString() { result = this.(ASTNode).toString() }
@@ -111,12 +102,10 @@ deprecated class DataFlowNode extends @dataflownode {
 }
 
 /** Holds if `nd` is a local source, that is, it has no local data flow predecessor. */
-private deprecated predicate isLocalSource(DataFlowNode nd) {
-  not exists(nd.localFlowPred())
-}
+deprecated private predicate isLocalSource(DataFlowNode nd) { not exists(nd.localFlowPred()) }
 
 /** Holds if data may flom from `nd` to `succ` in one local step. */
-private deprecated predicate localFlow(DataFlowNode nd, DataFlowNode succ) {
+deprecated private predicate localFlow(DataFlowNode nd, DataFlowNode succ) {
   nd = succ.localFlowPred()
 }
 
@@ -124,7 +113,7 @@ private deprecated predicate localFlow(DataFlowNode nd, DataFlowNode succ) {
  * Holds if `snk` is reachable from `src` in one or more local steps, where `src`
  * itself is reachable from a local source in zere or more local steps.
  */
-private deprecated predicate locallyReachable(DataFlowNode src, DataFlowNode snk) =
+deprecated private predicate locallyReachable(DataFlowNode src, DataFlowNode snk) =
   boundedFastTC(localFlow/2, isLocalSource/1)(src, snk)
 
 /**
@@ -133,12 +122,12 @@ private deprecated predicate locallyReachable(DataFlowNode src, DataFlowNode snk
  */
 deprecated class DataFlowIncompleteness extends string {
   DataFlowIncompleteness() {
-    this = "call" or   // lack of inter-procedural analysis
-    this = "heap" or   // lack of heap modeling
+    this = "call" or // lack of inter-procedural analysis
+    this = "heap" or // lack of heap modeling
     this = "import" or // lack of module import/export modeling
     this = "global" or // incomplete modeling of global object
-    this = "yield" or  // lack of yield/async/await modeling
-    this = "eval" or   // lack of reflection modeling
+    this = "yield" or // lack of yield/async/await modeling
+    this = "eval" or // lack of reflection modeling
     this = "namespace" // lack of exported variable modeling
   }
 }
@@ -146,7 +135,7 @@ deprecated class DataFlowIncompleteness extends string {
 /**
  * A variable access, viewed as a data flow node.
  */
-private deprecated class VarAccessFlow extends DataFlowNode, @varaccess {
+deprecated private class VarAccessFlow extends DataFlowNode, @varaccess {
   VarAccessFlow() { this instanceof RValue }
 
   /**
@@ -154,7 +143,7 @@ private deprecated class VarAccessFlow extends DataFlowNode, @varaccess {
    * this access may refer.
    */
   private VarDefFlow getALocalDef() {
-    exists (SsaDefinition def |
+    exists(SsaDefinition def |
       this = def.getVariable().getAUse() and
       result = def.getAContributingVarDef()
     )
@@ -166,7 +155,7 @@ private deprecated class VarAccessFlow extends DataFlowNode, @varaccess {
   }
 
   override DataFlowNode nonLocalFlowPred() {
-    exists (GlobalVariable v, VarDefFlow def |
+    exists(GlobalVariable v, VarDefFlow def |
       v = def.getAVariable() and
       result = def.getSourceNode() and
       this = v.getAnAccess()
@@ -174,16 +163,21 @@ private deprecated class VarAccessFlow extends DataFlowNode, @varaccess {
   }
 
   override predicate isIncomplete(DataFlowIncompleteness cause) {
-    exists (SsaDefinition ssa, VarDefFlow def |
-      this = ssa.getVariable().getAUse() and def = ssa.getAContributingVarDef() |
+    exists(SsaDefinition ssa, VarDefFlow def |
+      this = ssa.getVariable().getAUse() and def = ssa.getAContributingVarDef()
+    |
       def.isIncomplete(cause)
     )
     or
-    exists (Variable v | this = v.getAnAccess() |
-      v.isGlobal() and cause = "global" or
-      globalIsIncomplete(v, cause) or
-      v.isNamespaceExport() and cause = "namespace" or
-      v instanceof ArgumentsVariable and cause = "call" or
+    exists(Variable v | this = v.getAnAccess() |
+      v.isGlobal() and cause = "global"
+      or
+      globalIsIncomplete(v, cause)
+      or
+      v.isNamespaceExport() and cause = "namespace"
+      or
+      v instanceof ArgumentsVariable and cause = "call"
+      or
       any(DirectEval e).mayAffect(v) and cause = "eval"
     )
   }
@@ -196,8 +190,8 @@ private deprecated class VarAccessFlow extends DataFlowNode, @varaccess {
  * We exclude cause `"global"`, since all global variables have this incompleteness anyway.
  */
 pragma[noinline]
-private deprecated predicate globalIsIncomplete(GlobalVariable v, DataFlowIncompleteness cause) {
-  exists (VarDefFlow def |
+deprecated private predicate globalIsIncomplete(GlobalVariable v, DataFlowIncompleteness cause) {
+  exists(VarDefFlow def |
     v = def.getAVariable() and
     def.isIncomplete(cause) and
     cause != "global"
@@ -207,7 +201,7 @@ private deprecated predicate globalIsIncomplete(GlobalVariable v, DataFlowIncomp
 /**
  * A variable definition, viewed as a contributor to the data flow graph.
  */
-private deprecated class VarDefFlow extends VarDef {
+deprecated private class VarDefFlow extends VarDef {
   /**
    * Gets a data flow node representing the value assigned by this
    * definition.
@@ -223,10 +217,14 @@ private deprecated class VarDefFlow extends VarDef {
    * Holds if this definition is analyzed imprecisely due to `cause`.
    */
   predicate isIncomplete(DataFlowIncompleteness cause) {
-    this instanceof Parameter and cause = "call" or
-    this instanceof ImportSpecifier and cause = "import" or
-    exists (EnhancedForLoop efl | this = efl.getIteratorExpr()) and cause = "heap" or
-    exists (ComprehensionBlock cb | this = cb.getIterator()) and cause = "yield" or
+    this instanceof Parameter and cause = "call"
+    or
+    this instanceof ImportSpecifier and cause = "import"
+    or
+    exists(EnhancedForLoop efl | this = efl.getIteratorExpr()) and cause = "heap"
+    or
+    exists(ComprehensionBlock cb | this = cb.getIterator()) and cause = "yield"
+    or
     getTarget() instanceof DestructuringPattern and cause = "heap"
   }
 }
@@ -234,7 +232,7 @@ private deprecated class VarDefFlow extends VarDef {
 /**
  * An IIFE parameter, viewed as a contributor to the data flow graph.
  */
-private deprecated class IifeParameterFlow extends VarDefFlow {
+deprecated private class IifeParameterFlow extends VarDefFlow {
   /** The function of which this is a parameter. */
   ImmediatelyInvokedFunctionExpr iife;
 
@@ -243,9 +241,7 @@ private deprecated class IifeParameterFlow extends VarDefFlow {
     iife.argumentPassing(this, _)
   }
 
-  override DataFlowNode getSourceNode() {
-    iife.argumentPassing(this, result)
-  }
+  override DataFlowNode getSourceNode() { iife.argumentPassing(this, result) }
 
   override predicate isIncomplete(DataFlowIncompleteness cause) { none() }
 }
@@ -253,77 +249,60 @@ private deprecated class IifeParameterFlow extends VarDefFlow {
 /**
  * An ECMAScript 2015 import, viewed as a contributor to the data flow graph.
  */
-private deprecated class ImportSpecifierFlow extends VarDefFlow, ImportSpecifier {
-
-  override DataFlowNode getSourceNode() {
-    result = getLocal()
-  }
-
+deprecated private class ImportSpecifierFlow extends VarDefFlow, ImportSpecifier {
+  override DataFlowNode getSourceNode() { result = getLocal() }
 }
 
 /** A parenthesized expression, viewed as a data flow node. */
-private deprecated class ParExprFlow extends DataFlowNode, @parexpr {
-  override DataFlowNode localFlowPred() {
-    result = this.(ParExpr).getExpression()
-  }
+deprecated private class ParExprFlow extends DataFlowNode, @parexpr {
+  override DataFlowNode localFlowPred() { result = this.(ParExpr).getExpression() }
 }
 
 /** A type assertion, `E as T` or `<T> E`, viewed as a data flow node. */
-private deprecated class TypeAssertionFlow extends DataFlowNode, @typeassertion {
-  override DataFlowNode localFlowPred() {
-    result = this.(TypeAssertion).getExpression()
-  }
+deprecated private class TypeAssertionFlow extends DataFlowNode, @typeassertion {
+  override DataFlowNode localFlowPred() { result = this.(TypeAssertion).getExpression() }
 }
 
 /** A non-null assertion, `E!` viewed as a data flow node. */
-private deprecated class NonNullAssertionFlow extends DataFlowNode, @non_null_assertion {
-  override DataFlowNode localFlowPred() {
-    result = this.(NonNullAssertion).getExpression()
-  }
+deprecated private class NonNullAssertionFlow extends DataFlowNode, @non_null_assertion {
+  override DataFlowNode localFlowPred() { result = this.(NonNullAssertion).getExpression() }
 }
 
 /** An expression with type arguments, viewed as a data flow node. */
-private deprecated class ExpressionWithTypeArgumentsFlow extends DataFlowNode, @expressionwithtypearguments {
+deprecated private class ExpressionWithTypeArgumentsFlow extends DataFlowNode,
+  @expressionwithtypearguments {
   override DataFlowNode localFlowPred() {
     result = this.(ExpressionWithTypeArguments).getExpression()
   }
 }
 
 /** A sequence expression, viewed as a data flow node. */
-private deprecated class SeqExprFlow extends DataFlowNode, @seqexpr {
-  override DataFlowNode localFlowPred() {
-    result = this.(SeqExpr).getLastOperand()
-  }
+deprecated private class SeqExprFlow extends DataFlowNode, @seqexpr {
+  override DataFlowNode localFlowPred() { result = this.(SeqExpr).getLastOperand() }
 }
 
 /** A short-circuiting logical expression, viewed as a data flow node. */
-private deprecated class LogicalBinaryExprFlow extends DataFlowNode, @binaryexpr {
+deprecated private class LogicalBinaryExprFlow extends DataFlowNode, @binaryexpr {
   LogicalBinaryExprFlow() { this instanceof LogicalBinaryExpr }
 
-  override DataFlowNode localFlowPred() {
-    result = this.(LogicalBinaryExpr).getAnOperand()
-  }
+  override DataFlowNode localFlowPred() { result = this.(LogicalBinaryExpr).getAnOperand() }
 }
 
 /** An assignment expression, viewed as a data flow node. */
-private deprecated class AssignExprFlow extends DataFlowNode, @assignexpr {
-  override DataFlowNode localFlowPred() {
-    result = this.(AssignExpr).getRhs()
-  }
+deprecated private class AssignExprFlow extends DataFlowNode, @assignexpr {
+  override DataFlowNode localFlowPred() { result = this.(AssignExpr).getRhs() }
 }
 
 /** A conditional expression, viewed as a data flow node. */
-private deprecated class ConditionalExprFlow extends DataFlowNode, @conditionalexpr {
-  override DataFlowNode localFlowPred() {
-    result = this.(ConditionalExpr).getABranch()
-  }
+deprecated private class ConditionalExprFlow extends DataFlowNode, @conditionalexpr {
+  override DataFlowNode localFlowPred() { result = this.(ConditionalExpr).getABranch() }
 }
 
 /**
  * A data flow node whose value involves inter-procedural flow,
  * and which hence is analyzed incompletely.
  */
-private deprecated class InterProcFlow extends DataFlowNode, @expr {
+deprecated private class InterProcFlow extends DataFlowNode, @expr {
   InterProcFlow() {
     this instanceof InvokeExpr or
     this instanceof ThisExpr or
@@ -337,7 +316,7 @@ private deprecated class InterProcFlow extends DataFlowNode, @expr {
 }
 
 /** An external module reference, viewed as a data flow node. */
-private deprecated class ExternalModuleFlow extends DataFlowNode, @externalmodulereference {
+deprecated private class ExternalModuleFlow extends DataFlowNode, @externalmodulereference {
   override predicate isIncomplete(DataFlowIncompleteness cause) { cause = "import" }
 }
 
@@ -347,17 +326,13 @@ private deprecated class ExternalModuleFlow extends DataFlowNode, @externalmodul
  * Unlike other calls, we can analyze the value of an IIFE completely, hence
  * we override `InterProcFlow`.
  */
-private deprecated class IifeFlow extends InterProcFlow, @callexpr {
+deprecated private class IifeFlow extends InterProcFlow, @callexpr {
   /** The function this IIFE invokes. */
   ImmediatelyInvokedFunctionExpr iife;
 
-  IifeFlow() {
-    this = iife.getInvocation()
-  }
+  IifeFlow() { this = iife.getInvocation() }
 
-  override DataFlowNode localFlowPred() {
-    result = iife.getAReturnedExpr()
-  }
+  override DataFlowNode localFlowPred() { result = iife.getAReturnedExpr() }
 
   override predicate isIncomplete(DataFlowIncompleteness cause) { none() }
 }
@@ -365,7 +340,7 @@ private deprecated class IifeFlow extends InterProcFlow, @callexpr {
 /**
  * A property access, viewed as a data flow node.
  */
-private deprecated class PropAccessFlow extends DataFlowNode, @propaccess {
+deprecated private class PropAccessFlow extends DataFlowNode, @propaccess {
   override predicate isIncomplete(DataFlowIncompleteness cause) { cause = "heap" }
 }
 
@@ -373,7 +348,7 @@ private deprecated class PropAccessFlow extends DataFlowNode, @propaccess {
  * A data flow node whose value involves co-routines or promises,
  * and which hence is analyzed incompletely.
  */
-private deprecated class IteratorFlow extends DataFlowNode, @expr {
+deprecated private class IteratorFlow extends DataFlowNode, @expr {
   IteratorFlow() {
     this instanceof YieldExpr or
     this instanceof AwaitExpr or
@@ -439,11 +414,15 @@ abstract deprecated class PropWriteNode extends PropRefNode {
 /**
  * A property assignment, viewed as a data flow node.
  */
-private deprecated class PropAssignNode extends PropWriteNode, @propaccess {
+deprecated private class PropAssignNode extends PropWriteNode, @propaccess {
   PropAssignNode() { this instanceof LValue }
+
   override DataFlowNode getBase() { result = this.(PropAccess).getBase() }
+
   override Expr getPropertyNameExpr() { result = this.(PropAccess).getPropertyNameExpr() }
+
   override string getPropertyName() { result = this.(PropAccess).getPropertyName() }
+
   override DataFlowNode getRhs() { result = this.(LValue).getRhs() }
 }
 
@@ -451,12 +430,16 @@ private deprecated class PropAssignNode extends PropWriteNode, @propaccess {
  * A property of an object literal, viewed as a data flow node that writes
  * to the corresponding property.
  */
-private deprecated class PropInitNode extends PropWriteNode, @property {
+deprecated private class PropInitNode extends PropWriteNode, @property {
   /** Gets the property that this node wraps. */
   private Property getProperty() { result = this }
+
   override DataFlowNode getBase() { result = getProperty().getObjectExpr() }
+
   override Expr getPropertyNameExpr() { result = getProperty().getNameExpr() }
+
   override string getPropertyName() { result = getProperty().getName() }
+
   override DataFlowNode getRhs() { result = getProperty().(ValueProperty).getInit() }
 }
 
@@ -464,14 +447,19 @@ private deprecated class PropInitNode extends PropWriteNode, @property {
  * A call to `Object.defineProperty`, viewed as a data flow node that
  * writes to the corresponding property.
  */
-private deprecated class ObjectDefinePropNode extends PropWriteNode, @callexpr {
+deprecated private class ObjectDefinePropNode extends PropWriteNode, @callexpr {
   CallToObjectDefineProperty odp;
+
   ObjectDefinePropNode() { this = odp.asExpr() }
+
   override DataFlowNode getBase() { result = odp.getBaseObject().asExpr() }
+
   override Expr getPropertyNameExpr() { result = odp.getArgument(1).asExpr() }
+
   override string getPropertyName() { result = odp.getPropertyName() }
+
   override DataFlowNode getRhs() {
-    exists (ObjectExpr propdesc |
+    exists(ObjectExpr propdesc |
       propdesc = odp.getPropertyDescriptor().asExpr() and
       result = propdesc.getPropertyByName("value").getInit()
     )
@@ -482,15 +470,18 @@ private deprecated class ObjectDefinePropNode extends PropWriteNode, @callexpr {
  * A static member definition, viewed as a data flow node that adds
  * a property to the class.
  */
-private deprecated class StaticMemberAsWrite extends PropWriteNode, @expr {
-  StaticMemberAsWrite() {
-    exists (MemberDefinition md | md.isStatic() and this = md.getNameExpr())
-  }
+deprecated private class StaticMemberAsWrite extends PropWriteNode, @expr {
+  StaticMemberAsWrite() { exists(MemberDefinition md | md.isStatic() and this = md.getNameExpr()) }
+
   /** Gets the member definition that this node wraps. */
   private MemberDefinition getMember() { this = result.getNameExpr() }
+
   override DataFlowNode getBase() { result = getMember().getDeclaringClass() }
+
   override Expr getPropertyNameExpr() { result = getMember().getNameExpr() }
+
   override string getPropertyName() { result = getMember().getName() }
+
   override DataFlowNode getRhs() { result = getMember().getInit() }
 }
 
@@ -498,26 +489,34 @@ private deprecated class StaticMemberAsWrite extends PropWriteNode, @expr {
  * A spread property of an object literal, viewed as a data flow node that writes
  * properties of the object literal.
  */
-private deprecated class SpreadPropertyAsWrite extends PropWriteNode, @expr {
-  SpreadPropertyAsWrite() { exists (SpreadProperty prop | this = prop.getInit()) }
+deprecated private class SpreadPropertyAsWrite extends PropWriteNode, @expr {
+  SpreadPropertyAsWrite() { exists(SpreadProperty prop | this = prop.getInit()) }
+
   override DataFlowNode getBase() { result.(ObjectExpr).getAProperty().getInit() = this }
+
   override Expr getPropertyNameExpr() { none() }
+
   override string getPropertyName() { none() }
+
   override DataFlowNode getRhs() { none() }
 }
 
-
 /**
  * A JSX attribute, viewed as a data flow node that writes properties to
  * the JSX element it is in.
  */
-private deprecated class JSXAttributeAsWrite extends PropWriteNode, @identifier {
-  JSXAttributeAsWrite() { exists (JSXAttribute attr | this = attr.getNameExpr()) }
+deprecated private class JSXAttributeAsWrite extends PropWriteNode, @identifier {
+  JSXAttributeAsWrite() { exists(JSXAttribute attr | this = attr.getNameExpr()) }
+
   /** Gets the JSX attribute that this node wraps. */
   private JSXAttribute getAttribute() { result.getNameExpr() = this }
+
   override DataFlowNode getBase() { result = getAttribute().getElement() }
+
   override Expr getPropertyNameExpr() { result = this }
+
   override string getPropertyName() { result = this.(Identifier).getName() }
+
   override DataFlowNode getRhs() { result = getAttribute().getValue() }
 }
 
@@ -534,11 +533,15 @@ abstract deprecated class PropReadNode extends PropRefNode {
 /**
  * A property access in rvalue position.
  */
-private deprecated class PropAccessReadNode extends PropReadNode, @propaccess {
+deprecated private class PropAccessReadNode extends PropReadNode, @propaccess {
   PropAccessReadNode() { this instanceof RValue }
+
   override DataFlowNode getBase() { result = this.(PropAccess).getBase() }
+
   override Expr getPropertyNameExpr() { result = this.(PropAccess).getPropertyNameExpr() }
+
   override string getPropertyName() { result = this.(PropAccess).getPropertyName() }
+
   override DataFlowNode getDefault() { none() }
 }
 
@@ -546,18 +549,23 @@ private deprecated class PropAccessReadNode extends PropReadNode, @propaccess {
  * A property pattern viewed as a property read; for instance, in
  * `var { p: q } = o`, `p` is a read of property `p` of `o`.
  */
-private deprecated class PropPatternReadNode extends PropReadNode, @expr {
+deprecated private class PropPatternReadNode extends PropReadNode, @expr {
   PropPatternReadNode() { this = any(PropertyPattern p).getNameExpr() }
+
   /** Gets the property pattern that this node wraps. */
   private PropertyPattern getPropertyPattern() { this = result.getNameExpr() }
+
   override DataFlowNode getBase() {
-    exists (VarDef d |
+    exists(VarDef d |
       d.getTarget() = getPropertyPattern().getObjectPattern() and
       result = d.getSource()
     )
   }
+
   override Expr getPropertyNameExpr() { result = getPropertyPattern().getNameExpr() }
+
   override string getPropertyName() { result = getPropertyPattern().getName() }
+
   override DataFlowNode getDefault() { result = getPropertyPattern().getDefault() }
 }
 
@@ -565,15 +573,19 @@ private deprecated class PropPatternReadNode extends PropReadNode, @expr {
  * A rest pattern viewed as a property read; for instance, in
  * `var { ...ps } = o`, `ps` is a read of all properties of `o`.
  */
-private deprecated class RestPropertyAsRead extends PropReadNode {
+deprecated private class RestPropertyAsRead extends PropReadNode {
   RestPropertyAsRead() { this = any(ObjectPattern p).getRest() }
+
   override DataFlowNode getBase() {
-    exists (VarDef d |
+    exists(VarDef d |
       d.getTarget().(ObjectPattern).getRest() = this and
       result = d.getSource()
     )
   }
+
   override Expr getPropertyNameExpr() { none() }
+
   override string getPropertyName() { none() }
+
   override DataFlowNode getDefault() { none() }
 }
diff --git a/javascript/ql/src/semmle/javascript/DefUse.qll b/javascript/ql/src/semmle/javascript/DefUse.qll
index 11e6346c2a5c..670deb1fad2e 100644
--- a/javascript/ql/src/semmle/javascript/DefUse.qll
+++ b/javascript/ql/src/semmle/javascript/DefUse.qll
@@ -25,28 +25,21 @@ import javascript
  * to that reference.
  */
 private predicate defn(ControlFlowNode def, Expr lhs, AST::ValueNode rhs) {
-  exists (AssignExpr assgn | def = assgn |
-    lhs = assgn.getTarget() and rhs = assgn.getRhs()
-  ) or
-  exists (VariableDeclarator vd | def = vd |
-    lhs = vd.getBindingPattern() and rhs = vd.getInit()
-  ) or
-  exists (Function f | def = f.getId() |
-    lhs = def and rhs = f
-  ) or
-  exists (ClassDefinition c | lhs = c.getIdentifier() |
-    def = c and rhs = c and not c.isAmbient()
-  ) or
-  exists (NamespaceDeclaration n | def = n |
-    lhs = n.getId() and rhs = n
-  ) or
-  exists (EnumDeclaration ed | def = ed.getIdentifier() |
-    lhs = def and rhs = ed
-  ) or
-  exists (ImportEqualsDeclaration i | def = i |
-    lhs = i.getId() and rhs = i.getImportedEntity()
-  ) or
-  exists (EnumMember member | def = member.getIdentifier() |
+  exists(AssignExpr assgn | def = assgn | lhs = assgn.getTarget() and rhs = assgn.getRhs())
+  or
+  exists(VariableDeclarator vd | def = vd | lhs = vd.getBindingPattern() and rhs = vd.getInit())
+  or
+  exists(Function f | def = f.getId() | lhs = def and rhs = f)
+  or
+  exists(ClassDefinition c | lhs = c.getIdentifier() | def = c and rhs = c and not c.isAmbient())
+  or
+  exists(NamespaceDeclaration n | def = n | lhs = n.getId() and rhs = n)
+  or
+  exists(EnumDeclaration ed | def = ed.getIdentifier() | lhs = def and rhs = ed)
+  or
+  exists(ImportEqualsDeclaration i | def = i | lhs = i.getId() and rhs = i.getImportedEntity())
+  or
+  exists(EnumMember member | def = member.getIdentifier() |
     lhs = def and rhs = member.getInitializer()
   )
 }
@@ -69,20 +62,28 @@ private predicate defn(ControlFlowNode def, Expr lhs, AST::ValueNode rhs) {
  * Additionally, parameters are also considered definitions, which are their own `lhs`.
  */
 private predicate defn(ControlFlowNode def, Expr lhs) {
-  defn(def, lhs, _) or
-  lhs = def.(CompoundAssignExpr).getTarget() or
-  lhs = def.(UpdateExpr).getOperand().getUnderlyingReference() or
-  lhs = def.(ImportSpecifier).getLocal() or
-  exists (EnhancedForLoop efl | def = efl.getIteratorExpr() |
+  defn(def, lhs, _)
+  or
+  lhs = def.(CompoundAssignExpr).getTarget()
+  or
+  lhs = def.(UpdateExpr).getOperand().getUnderlyingReference()
+  or
+  lhs = def.(ImportSpecifier).getLocal()
+  or
+  exists(EnhancedForLoop efl | def = efl.getIteratorExpr() |
     lhs = def.(Expr).stripParens() or
     lhs = def.(VariableDeclarator).getBindingPattern()
-  ) or
-  lhs = def and (
+  )
+  or
+  lhs = def and
+  (
     def instanceof Parameter or
     def = any(ComprehensionBlock cb).getIterator()
-  ) or
-  exists (EnumMember member | def = member.getIdentifier() |
-    lhs = def and not exists (member.getInitializer()))
+  )
+  or
+  exists(EnumMember member | def = member.getIdentifier() |
+    lhs = def and not exists(member.getInitializer())
+  )
 }
 
 /**
@@ -95,9 +96,9 @@ private predicate defn(ControlFlowNode def, Expr lhs) {
 private predicate lvalAux(Expr l, ControlFlowNode def) {
   defn(def, l)
   or
-  exists (ArrayPattern ap | lvalAux(ap, def) | l = ap.getAnElement().stripParens())
+  exists(ArrayPattern ap | lvalAux(ap, def) | l = ap.getAnElement().stripParens())
   or
-  exists (ObjectPattern op | lvalAux(op, def) |
+  exists(ObjectPattern op | lvalAux(op, def) |
     l = op.getAPropertyPattern().getValuePattern().stripParens() or
     l = op.getRest().stripParens()
   )
@@ -140,10 +141,13 @@ class LValue extends RefExpr {
  */
 class RValue extends RefExpr {
   RValue() {
-    not this instanceof LValue and not this instanceof VarDecl or
+    not this instanceof LValue and not this instanceof VarDecl
+    or
     // in `x++` and `x += 1`, `x` is both RValue and LValue
-    this = any(CompoundAssignExpr a).getTarget() or
-    this = any(UpdateExpr u).getOperand().getUnderlyingReference() or
+    this = any(CompoundAssignExpr a).getTarget()
+    or
+    this = any(UpdateExpr u).getOperand().getUnderlyingReference()
+    or
     this = any(NamespaceDeclaration decl).getId()
   }
 }
@@ -167,22 +171,16 @@ class RValue extends RefExpr {
  * `x` as well as property `p` of `z`.
  */
 class VarDef extends ControlFlowNode {
-  VarDef() {
-    defn(this, _)
-  }
+  VarDef() { defn(this, _) }
 
   /**
    * Gets the target of this definition, which is either a simple variable
    * reference, a destructuring pattern, or a property access.
    */
-  Expr getTarget() {
-    defn(this, result)
-  }
+  Expr getTarget() { defn(this, result) }
 
   /** Gets a variable defined by this node, if any. */
-  Variable getAVariable() {
-    result = getTarget().(BindingPattern).getAVariable()
-  }
+  Variable getAVariable() { result = getTarget().(BindingPattern).getAVariable() }
 
   /**
    * Gets the source of this definition, that is, the data flow node representing
@@ -191,17 +189,16 @@ class VarDef extends ControlFlowNode {
    * This predicate is not defined for `VarDef`s where the source is implicit,
    * such as `for-in` loops or parameters.
    */
-  AST::ValueNode getSource() {
-    defn(this, _, result)
-  }
+  AST::ValueNode getSource() { defn(this, _, result) }
 
   /**
    * Holds if this definition of `v` is overwritten by another definition, that is,
    * another definition of `v` is reachable from it in the CFG.
    */
   predicate isOverwritten(Variable v) {
-    exists (BasicBlock bb, int i | bb.defAt(i, v, this) |
-      exists (int j | bb.defAt(j, v, _) and j > i) or
+    exists(BasicBlock bb, int i | bb.defAt(i, v, this) |
+      exists(int j | bb.defAt(j, v, _) and j > i)
+      or
       bb.getASuccessor+().defAt(_, v, _)
     )
   }
@@ -213,14 +210,10 @@ class VarDef extends ControlFlowNode {
  * Some variable definitions are also uses, notably the operands of update expressions.
  */
 class VarUse extends ControlFlowNode, @varref {
-  VarUse() {
-    this instanceof RValue
-  }
+  VarUse() { this instanceof RValue }
 
   /** Gets the variable this use refers to. */
-  Variable getVariable() {
-    result = this.(VarRef).getVariable()
-  }
+  Variable getVariable() { result = this.(VarRef).getVariable() }
 
   /**
    * Gets a definition that may reach this use.
@@ -229,7 +222,7 @@ class VarUse extends ControlFlowNode, @varref {
    */
   VarDef getADef() {
     result = getSsaVariable().getDefinition().getAContributingVarDef() or
-    result.getAVariable() = (GlobalVariable)getVariable()
+    result.getAVariable() = getVariable().(GlobalVariable)
   }
 
   /**
@@ -237,9 +230,7 @@ class VarUse extends ControlFlowNode, @varref {
    *
    * This predicate is only defined for variables that can be SSA-converted.
    */
-  SsaVariable getSsaVariable() {
-    result.getAUse() = this
-  }
+  SsaVariable getSsaVariable() { result.getAUse() = this }
 }
 
 /**
@@ -248,10 +239,10 @@ class VarUse extends ControlFlowNode, @varref {
  */
 predicate definitionReaches(Variable v, VarDef def, VarUse use) {
   v = use.getVariable() and
-  exists (BasicBlock bb, int i, int next |
-    next = nextDefAfter(bb, v, i, def) |
-    exists (int j | j in [i+1..next-1] | bb.useAt(j, v, use)) or
-    exists (BasicBlock succ | succ = bb.getASuccessor() |
+  exists(BasicBlock bb, int i, int next | next = nextDefAfter(bb, v, i, def) |
+    exists(int j | j in [i + 1 .. next - 1] | bb.useAt(j, v, use))
+    or
+    exists(BasicBlock succ | succ = bb.getASuccessor() |
       succ.isLiveAtEntry(v, use) and
       next = bb.length()
     )
@@ -263,7 +254,7 @@ predicate definitionReaches(Variable v, VarDef def, VarUse use) {
  * without crossing another definition of `v`.
  */
 predicate localDefinitionReaches(LocalVariable v, VarDef def, VarUse use) {
-  exists (SsaExplicitDefinition ssa |
+  exists(SsaExplicitDefinition ssa |
     ssa.defines(def, v) and
     ssa = getAPseudoDefinitionInput*(use.getSsaVariable().getDefinition())
   )
@@ -280,7 +271,10 @@ private SsaDefinition getAPseudoDefinitionInput(SsaDefinition nd) {
  */
 private int nextDefAfter(BasicBlock bb, Variable v, int i, VarDef d) {
   bb.defAt(i, v, d) and
-  result = min(int jj | (bb.defAt(jj, v, _) or jj = bb.length()) and jj > i)
+  result = min(int jj |
+      (bb.defAt(jj, v, _) or jj = bb.length()) and
+      jj > i
+    )
 }
 
 /**
@@ -290,10 +284,10 @@ private int nextDefAfter(BasicBlock bb, Variable v, int i, VarDef d) {
  * another definition of `v`.
  */
 predicate localDefinitionOverwrites(LocalVariable v, VarDef earlier, VarDef later) {
-  exists (BasicBlock bb, int i, int next |
-    next = nextDefAfter(bb, v, i, earlier) |
-    bb.defAt(next, v, later) or
-    exists (BasicBlock succ | succ = bb.getASuccessor() |
+  exists(BasicBlock bb, int i, int next | next = nextDefAfter(bb, v, i, earlier) |
+    bb.defAt(next, v, later)
+    or
+    exists(BasicBlock succ | succ = bb.getASuccessor() |
       succ.localMayBeOverwritten(v, later) and
       next = bb.length()
     )
diff --git a/javascript/ql/src/semmle/javascript/DefensiveProgramming.qll b/javascript/ql/src/semmle/javascript/DefensiveProgramming.qll
index 6529566495b6..a1e468210b49 100644
--- a/javascript/ql/src/semmle/javascript/DefensiveProgramming.qll
+++ b/javascript/ql/src/semmle/javascript/DefensiveProgramming.qll
@@ -31,19 +31,21 @@ module Internal {
     DefensiveInit() {
       exists(VarAccess va, LogOrExpr o, VarRef va2 |
         va = astNode and
-        va = o.getLeftOperand().stripParens() and va2.getVariable() = va.getVariable() |
+        va = o.getLeftOperand().stripParens() and
+        va2.getVariable() = va.getVariable()
+      |
         exists(AssignExpr assgn | va2 = assgn.getTarget() |
           assgn = o.getRightOperand().stripParens() or
           o = assgn.getRhs().stripParens()
         )
         or
-        exists(VariableDeclarator vd | va2 = vd.getBindingPattern() | o = vd.getInit().stripParens())
+        exists(VariableDeclarator vd | va2 = vd.getBindingPattern() |
+          o = vd.getInit().stripParens()
+        )
       )
     }
 
-    override boolean getTheTestResult() {
-      result = analyze().getTheBooleanValue()
-    }
+    override boolean getTheTestResult() { result = analyze().getTheBooleanValue() }
   }
 
   /**
@@ -51,12 +53,13 @@ module Internal {
    * `polarity` is true iff the inner expression is nested in an even number of negations.
    */
   private Expr stripNotsAndParens(Expr e, boolean polarity) {
-    exists (Expr inner |
-      inner = e.getUnderlyingValue() |
-      if inner instanceof LogNotExpr then
-        (result = stripNotsAndParens(inner.(LogNotExpr).getOperand(), polarity.booleanNot()))
-      else
-        (result = inner and polarity = true)
+    exists(Expr inner | inner = e.getUnderlyingValue() |
+      if inner instanceof LogNotExpr
+      then (
+        result = stripNotsAndParens(inner.(LogNotExpr).getOperand(), polarity.booleanNot())
+      ) else (
+        result = inner and polarity = true
+      )
     )
   }
 
@@ -65,7 +68,7 @@ module Internal {
    *
    * Examples: `e === undefined` or `typeof e !== undefined`.
    */
-  private abstract class UndefinedNullTest extends EqualityTest {
+  abstract private class UndefinedNullTest extends EqualityTest {
     /** Gets the unique Boolean value that this test evaluates to, if any. */
     abstract boolean getTheTestResult();
 
@@ -81,13 +84,14 @@ module Internal {
    * Example: a branch in `x === null || x === undefined`.
    */
   private class CompositeUndefinedNullTestPart extends DefensiveExpressionTest {
-
     UndefinedNullTest test;
 
     boolean polarity;
 
-    CompositeUndefinedNullTestPart(){
-      exists (LogicalBinaryExpr composite, Variable v, Expr op, Expr opOther, UndefinedNullTest testOther |
+    CompositeUndefinedNullTestPart() {
+      exists(
+        LogicalBinaryExpr composite, Variable v, Expr op, Expr opOther, UndefinedNullTest testOther
+      |
         composite.hasOperands(op, opOther) and
         this = op.flow() and
         test = stripNotsAndParens(op, polarity) and
@@ -102,7 +106,6 @@ module Internal {
       or
       polarity = false and result = test.getTheTestResult().booleanNot()
     }
-
   }
 
   /**
@@ -111,13 +114,12 @@ module Internal {
    * Example: `if (x === null) ...`.
    */
   private class SanityCheckingUndefinedNullGuard extends DefensiveExpressionTest {
-
     UndefinedNullTest test;
 
     boolean polarity;
 
     SanityCheckingUndefinedNullGuard() {
-      exists (IfStmt c |
+      exists(IfStmt c |
         this = c.getCondition().flow() and
         test = stripNotsAndParens(c.getCondition(), polarity) and
         test.getOperand() instanceof VarRef
@@ -129,7 +131,6 @@ module Internal {
       or
       polarity = false and result = test.getTheTestResult().booleanNot()
     }
-
   }
 
   /**
@@ -143,9 +144,7 @@ module Internal {
   /**
    * Holds if `t` is not `null` or `undefined`.
    */
-  private predicate isNotNullOrUndefined(InferredType t) {
-    not isNullOrUndefined(t)
-  }
+  private predicate isNotNullOrUndefined(InferredType t) { not isNullOrUndefined(t) }
 
   /**
    * A value comparison for `null` and `undefined`.
@@ -153,14 +152,12 @@ module Internal {
    * Examples: `x === null` or `x != undefined`.
    */
   private class NullUndefinedComparison extends UndefinedNullTest {
-
     Expr operand;
 
     InferredType op2type;
 
     NullUndefinedComparison() {
-      exists (Expr op2 |
-        hasOperands(operand, op2) |
+      exists(Expr op2 | hasOperands(operand, op2) |
         op2type = TTNull() and SyntacticConstants::isNull(op2)
         or
         op2type = TTUndefined() and SyntacticConstants::isUndefined(op2)
@@ -170,7 +167,8 @@ module Internal {
     override boolean getTheTestResult() {
       result = getPolarity() and
       (
-        if this instanceof StrictEqualityTest then
+        if this instanceof StrictEqualityTest
+        then
           // case: `operand === null` or `operand === undefined`
           operand.analyze().getTheType() = op2type
         else
@@ -180,7 +178,8 @@ module Internal {
       or
       result = getPolarity().booleanNot() and
       (
-        if this instanceof StrictEqualityTest then
+        if this instanceof StrictEqualityTest
+        then
           // case: `operand !== null` or `operand !== undefined`
           not operand.analyze().getAType() = op2type
         else
@@ -189,9 +188,7 @@ module Internal {
       )
     }
 
-    override Expr getOperand() {
-      result = operand
-    }
+    override Expr getOperand() { result = operand }
   }
 
   /**
@@ -200,7 +197,6 @@ module Internal {
    * Examples: `sub.p` or `sub()`.
    */
   private class UndefinedNullCrashUse extends Expr {
-
     Expr target;
 
     UndefinedNullCrashUse() {
@@ -214,10 +210,7 @@ module Internal {
     /**
      * Gets the subexpression that will cause an exception to be thrown if it is `null` or `undefined`.
      */
-    Expr getVulnerableSubexpression() {
-      result = target
-    }
-
+    Expr getVulnerableSubexpression() { result = target }
   }
 
   /**
@@ -226,20 +219,14 @@ module Internal {
    * Example: `sub()`.
    */
   private class NonFunctionCallCrashUse extends Expr {
-
     Expr target;
 
-    NonFunctionCallCrashUse() {
-      this.(InvokeExpr).getCallee().getUnderlyingValue() = target
-    }
+    NonFunctionCallCrashUse() { this.(InvokeExpr).getCallee().getUnderlyingValue() = target }
 
     /**
      * Gets the subexpression that will cause an exception to be thrown if it is not a `function`.
      */
-    Expr getVulnerableSubexpression() {
-      result = target
-    }
-
+    Expr getVulnerableSubexpression() { result = target }
   }
 
   /**
@@ -253,15 +240,13 @@ module Internal {
     or
     exists(IfStmt c, ExprStmt guardedStmt |
       c.getCondition() = guard and
-      result = guardedStmt.getExpr() |
+      result = guardedStmt.getExpr()
+    |
       guardedStmt = c.getAControlledStmt() or
       guardedStmt = c.getAControlledStmt().(BlockStmt).getStmt(0)
     )
     or
-    exists (ConditionalExpr c |
-      c.getCondition() = guard |
-      result = c.getABranch()
-    )
+    exists(ConditionalExpr c | c.getCondition() = guard | result = c.getABranch())
   }
 
   /**
@@ -279,31 +264,29 @@ module Internal {
    * Examples: The condition in `if(x) { x.p; }` or `!x || x.m()`.
    */
   private class UndefinedNullTruthinessGuard extends DefensiveExpressionTest {
-
     VarRef guardVar;
 
     boolean polarity;
 
     UndefinedNullTruthinessGuard() {
-      exists (VarRef useVar |
+      exists(VarRef useVar |
         guardVar = stripNotsAndParens(this.asExpr(), polarity) and
-        guardVar.getVariable() = useVar.getVariable() |
-        getAGuardedExpr(this.asExpr()).getUnderlyingValue().(UndefinedNullCrashUse).getVulnerableSubexpression() = useVar and
+        guardVar.getVariable() = useVar.getVariable()
+      |
+        getAGuardedExpr(this.asExpr())
+            .getUnderlyingValue()
+            .(UndefinedNullCrashUse)
+            .getVulnerableSubexpression() = useVar and
         // exclude types whose truthiness depend on the value
         not isStringOrNumOrBool(guardVar.analyze().getAType())
       )
     }
 
     override boolean getTheTestResult() {
-      exists (boolean testResult |
-        testResult = guardVar.analyze().getTheBooleanValue() |
-        if polarity = true then
-          result = testResult
-        else
-          result = testResult.booleanNot()
+      exists(boolean testResult | testResult = guardVar.analyze().getTheBooleanValue() |
+        if polarity = true then result = testResult else result = testResult.booleanNot()
       )
     }
-
   }
 
   /**
@@ -312,18 +295,21 @@ module Internal {
    * Example: the condition in `if(x !== null) { x.p; }`.
    */
   private class UndefinedNullTypeGuard extends DefensiveExpressionTest {
-
     UndefinedNullTest test;
 
     boolean polarity;
 
     UndefinedNullTypeGuard() {
-      exists (Expr guard, VarRef guardVar, VarRef useVar |
+      exists(Expr guard, VarRef guardVar, VarRef useVar |
         this = guard.flow() and
         test = stripNotsAndParens(guard, polarity) and
         test.getOperand() = guardVar and
-        guardVar.getVariable() = useVar.getVariable() |
-        getAGuardedExpr(guard).getUnderlyingValue().(UndefinedNullCrashUse).getVulnerableSubexpression() = useVar
+        guardVar.getVariable() = useVar.getVariable()
+      |
+        getAGuardedExpr(guard)
+            .getUnderlyingValue()
+            .(UndefinedNullCrashUse)
+            .getVulnerableSubexpression() = useVar
       )
     }
 
@@ -332,7 +318,6 @@ module Internal {
       or
       polarity = false and result = test.getTheTestResult().booleanNot()
     }
-
   }
 
   /**
@@ -346,37 +331,31 @@ module Internal {
     TypeofTag tag;
 
     TypeofTest() {
-      exists (Expr op1, Expr op2 |
-        hasOperands(op1, op2) |
+      exists(Expr op1, Expr op2 | hasOperands(op1, op2) |
         operand = op1.(TypeofExpr).getOperand() and
         op2.mayHaveStringValue(tag)
       )
     }
 
     boolean getTheTestResult() {
-      exists (boolean testResult |
-        testResult = true and operand.analyze().getTheType().getTypeofTag() = tag or
-        testResult = false and not operand.analyze().getAType().getTypeofTag() = tag |
-        if getPolarity() = true then
-          result = testResult
-        else
-          result = testResult.booleanNot()
+      exists(boolean testResult |
+        testResult = true and operand.analyze().getTheType().getTypeofTag() = tag
+        or
+        testResult = false and not operand.analyze().getAType().getTypeofTag() = tag
+      |
+        if getPolarity() = true then result = testResult else result = testResult.booleanNot()
       )
     }
 
     /**
      * Gets the operand used in the `typeof` expression.
      */
-    Expr getOperand() {
-      result = operand
-    }
+    Expr getOperand() { result = operand }
 
     /**
      * Gets the `typeof` tag that is tested.
      */
-    TypeofTag getTag() {
-      result = tag
-    }
+    TypeofTag getTag() { result = tag }
   }
 
   /**
@@ -385,18 +364,21 @@ module Internal {
    * Example: the condition in `if(typeof x === 'function') x()`.
    */
   private class FunctionTypeGuard extends DefensiveExpressionTest {
-
     TypeofTest test;
 
     boolean polarity;
 
     FunctionTypeGuard() {
-      exists (Expr guard, VarRef guardVar, VarRef useVar |
+      exists(Expr guard, VarRef guardVar, VarRef useVar |
         this = guard.flow() and
         test = stripNotsAndParens(guard, polarity) and
         test.getOperand() = guardVar and
-        guardVar.getVariable() = useVar.getVariable() |
-        getAGuardedExpr(guard).getUnderlyingValue().(NonFunctionCallCrashUse).getVulnerableSubexpression() = useVar
+        guardVar.getVariable() = useVar.getVariable()
+      |
+        getAGuardedExpr(guard)
+            .getUnderlyingValue()
+            .(NonFunctionCallCrashUse)
+            .getVulnerableSubexpression() = useVar
       ) and
       test.getTag() = "function"
     }
@@ -406,7 +388,6 @@ module Internal {
       or
       polarity = false and result = test.getTheTestResult().booleanNot()
     }
-
   }
 
   /**
@@ -415,7 +396,6 @@ module Internal {
    * Example: `typeof x === undefined'.
    */
   class TypeofUndefinedTest extends UndefinedNullTest {
-
     TypeofTest test;
 
     TypeofUndefinedTest() {
@@ -423,14 +403,8 @@ module Internal {
       test.getTag() = "undefined"
     }
 
-    override boolean getTheTestResult() {
-      result = test.getTheTestResult()
-    }
-
-    override Expr getOperand() {
-      result = test.getOperand()
-    }
+    override boolean getTheTestResult() { result = test.getTheTestResult() }
 
+    override Expr getOperand() { result = test.getOperand() }
   }
-
-}
\ No newline at end of file
+}
diff --git a/javascript/ql/src/semmle/javascript/ES2015Modules.qll b/javascript/ql/src/semmle/javascript/ES2015Modules.qll
index 4cfa9dcb04d8..55e820f77ee3 100644
--- a/javascript/ql/src/semmle/javascript/ES2015Modules.qll
+++ b/javascript/ql/src/semmle/javascript/ES2015Modules.qll
@@ -11,40 +11,25 @@ class ES2015Module extends Module {
     not isNodejs(this)
   }
 
-  override ModuleScope getScope() {
-    result.getScopeElement() = this
-  }
+  override ModuleScope getScope() { result.getScopeElement() = this }
 
   /** Gets the full path of the file containing this module. */
-  override string getPath() {
-    result = getFile().getAbsolutePath()
-  }
+  override string getPath() { result = getFile().getAbsolutePath() }
 
   /** Gets the short name of this module without file extension. */
-  override string getName() {
-    result = getFile().getStem()
-  }
+  override string getName() { result = getFile().getStem() }
 
   /** Gets an export declaration in this module. */
-  ExportDeclaration getAnExport() {
-    result.getTopLevel() = this
-  }
+  ExportDeclaration getAnExport() { result.getTopLevel() = this }
 
-  override Module getAnImportedModule() {
-    result = getAnImport().getImportedModule()
-  }
+  override Module getAnImportedModule() { result = getAnImport().getImportedModule() }
 
   override predicate exports(string name, ASTNode export) {
-    exists (ExportDeclaration ed |
-      ed = getAnExport() and ed = export |
-      ed.exportsAs(_, name)
-    )
+    exists(ExportDeclaration ed | ed = getAnExport() and ed = export | ed.exportsAs(_, name))
   }
 
   /** Holds if this module exports variable `v` under the name `name`. */
-  predicate exportsAs(LexicalName v, string name) {
-    getAnExport().exportsAs(v, name)
-  }
+  predicate exportsAs(LexicalName v, string name) { getAnExport().exportsAs(v, name) }
 
   override predicate isStrict() {
     // modules are implicitly strict
@@ -54,30 +39,20 @@ class ES2015Module extends Module {
 
 /** An import declaration. */
 class ImportDeclaration extends Stmt, Import, @importdeclaration {
-  override ES2015Module getEnclosingModule() {
-    result = getTopLevel()
-  }
+  override ES2015Module getEnclosingModule() { result = getTopLevel() }
 
-  override PathExprInModule getImportedPath() {
-    result = getChildExpr(-1)
-  }
+  override PathExprInModule getImportedPath() { result = getChildExpr(-1) }
 
   /** Gets the `i`th import specifier of this import declaration. */
-  ImportSpecifier getSpecifier(int i) {
-    result = getChildExpr(i)
-  }
+  ImportSpecifier getSpecifier(int i) { result = getChildExpr(i) }
 
   /** Gets an import specifier of this import declaration. */
-  ImportSpecifier getASpecifier() {
-    result = getSpecifier(_)
-  }
+  ImportSpecifier getASpecifier() { result = getSpecifier(_) }
 }
 
 /** A literal path expression appearing in an `import` declaration. */
 private class LiteralImportPath extends PathExprInModule, ConstantString {
-  LiteralImportPath() {
-    exists (ImportDeclaration req | this = req.getChildExpr(-1))
-  }
+  LiteralImportPath() { exists(ImportDeclaration req | this = req.getChildExpr(-1)) }
 
   override string getValue() { result = this.(ConstantString).getStringValue() }
 }
@@ -98,12 +73,10 @@ private class LiteralImportPath extends PathExprInModule, ConstantString {
  *   - renaming import specifiers, which import a named export of a module and
  *     make it available in the importing module under a different name, as in
  *     `import {` <u>`x as y`</u> `} from 'a'`.
- * */
+ */
 class ImportSpecifier extends Expr, @importspecifier {
   /** Gets the imported symbol; undefined for default and namespace import specifiers. */
-  Identifier getImported() {
-    result = getChildExpr(0)
-  }
+  Identifier getImported() { result = getChildExpr(0) }
 
   /**
    * Gets the name of the imported symbol.
@@ -120,55 +93,42 @@ class ImportSpecifier extends Expr, @importspecifier {
    * The names of the imported symbols for the first three of them are, respectively,
    * `x`, `y` and `default`, while the last one does not import an individual symbol.
    */
-  string getImportedName() {
-    result = getImported().getName()
-  }
+  string getImportedName() { result = getImported().getName() }
 
   /** Gets the local variable into which this specifier imports. */
-  VarDecl getLocal() {
-    result = getChildExpr(1)
-  }
+  VarDecl getLocal() { result = getChildExpr(1) }
 }
 
 /** A named import specifier. */
-class NamedImportSpecifier extends ImportSpecifier, @namedimportspecifier {
-}
+class NamedImportSpecifier extends ImportSpecifier, @namedimportspecifier { }
 
 /** A default import specifier. */
 class ImportDefaultSpecifier extends ImportSpecifier, @importdefaultspecifier {
-  override string getImportedName() {
-    result = "default"
-  }
+  override string getImportedName() { result = "default" }
 }
 
 /** A namespace import specifier. */
-class ImportNamespaceSpecifier extends ImportSpecifier, @importnamespacespecifier {
-}
+class ImportNamespaceSpecifier extends ImportSpecifier, @importnamespacespecifier { }
 
 /** A bulk import that imports an entire module as a namespace. */
 class BulkImportDeclaration extends ImportDeclaration {
-  BulkImportDeclaration() {
-    getASpecifier() instanceof ImportNamespaceSpecifier
-  }
+  BulkImportDeclaration() { getASpecifier() instanceof ImportNamespaceSpecifier }
 
   /** Gets the local namespace variable under which the module is imported. */
-  VarDecl getLocal() {
-    result = getASpecifier().getLocal()
-  }
+  VarDecl getLocal() { result = getASpecifier().getLocal() }
 }
 
 /** A selective import that imports zero or more declarations. */
 class SelectiveImportDeclaration extends ImportDeclaration {
-  SelectiveImportDeclaration() {
-    not this instanceof BulkImportDeclaration
-  }
+  SelectiveImportDeclaration() { not this instanceof BulkImportDeclaration }
 
   /** Holds if `local` is the local variable into which `imported` is imported. */
   predicate importsAs(string imported, LexicalDecl local) {
-    exists (ImportSpecifier spec | spec = getASpecifier() |
+    exists(ImportSpecifier spec | spec = getASpecifier() |
       imported = spec.getImported().getName() and
       local = spec.getLocal()
-    ) or
+    )
+    or
     imported = "default" and local = getASpecifier().(ImportDefaultSpecifier).getLocal()
   }
 }
@@ -189,9 +149,7 @@ class SelectiveImportDeclaration extends ImportDeclaration {
  */
 abstract class ExportDeclaration extends Stmt, @exportdeclaration {
   /** Gets the module to which this export declaration belongs. */
-  ES2015Module getEnclosingModule() {
-    this = result.getAnExport()
-  }
+  ES2015Module getEnclosingModule() { this = result.getAnExport() }
 
   /** Holds if this export declaration exports variable `v` under the name `name`. */
   abstract predicate exportsAs(LexicalName v, string name);
@@ -226,9 +184,7 @@ abstract class ExportDeclaration extends Stmt, @exportdeclaration {
  */
 class BulkReExportDeclaration extends ReExportDeclaration, @exportalldeclaration {
   /** Gets the name of the module from which this declaration re-exports. */
-  override ConstantString getImportedPath() {
-    result = getChildExpr(0)
-  }
+  override ConstantString getImportedPath() { result = getChildExpr(0) }
 
   override predicate exportsAs(LexicalName v, string name) {
     getImportedModule().exportsAs(v, name) and
@@ -241,23 +197,24 @@ class BulkReExportDeclaration extends ReExportDeclaration, @exportalldeclaration
 }
 
 /**
-  * Holds if the given bulk export should not re-export `name` because there is an explicit export
-  * of that name in the same module.
-  *
-  * At compile time, shadowing works across declaration spaces.
-  * For instance, directly exporting an interface `X` will block a variable `X` from being re-exported:
-  * ```
-  * export interface X {}
-  * export * from 'lib' // will not re-export X
-  * ```
-  * At runtime, the interface `X` will have been removed, so `X` is actually re-exported anyway,
-  * but we ignore this subtlety.
-  */
+ * Holds if the given bulk export should not re-export `name` because there is an explicit export
+ * of that name in the same module.
+ *
+ * At compile time, shadowing works across declaration spaces.
+ * For instance, directly exporting an interface `X` will block a variable `X` from being re-exported:
+ * ```
+ * export interface X {}
+ * export * from 'lib' // will not re-export X
+ * ```
+ * At runtime, the interface `X` will have been removed, so `X` is actually re-exported anyway,
+ * but we ignore this subtlety.
+ */
 private predicate isShadowedFromBulkExport(BulkReExportDeclaration reExport, string name) {
-  exists (ExportNamedDeclaration other | other.getTopLevel() = reExport.getEnclosingModule() |
+  exists(ExportNamedDeclaration other | other.getTopLevel() = reExport.getEnclosingModule() |
     other.getAnExportedDecl().getName() = name
     or
-    other.getASpecifier().getExportedName() = name)
+    other.getASpecifier().getExportedName() = name
+  )
 }
 
 /**
@@ -266,9 +223,7 @@ private predicate isShadowedFromBulkExport(BulkReExportDeclaration reExport, str
  */
 class ExportDefaultDeclaration extends ExportDeclaration, @exportdefaultdeclaration {
   /** Gets the operand statement or expression that is exported by this declaration. */
-  ExprOrStmt getOperand() {
-    result = getChild(0)
-  }
+  ExprOrStmt getOperand() { result = getChild(0) }
 
   override predicate exportsAs(LexicalName v, string name) {
     name = "default" and v = getADecl().getVariable()
@@ -276,7 +231,7 @@ class ExportDefaultDeclaration extends ExportDeclaration, @exportdefaultdeclarat
 
   /** Gets the declaration, if any, exported by this default export. */
   VarDecl getADecl() {
-    exists (ExprOrStmt op | op = getOperand() |
+    exists(ExprOrStmt op | op = getOperand() |
       result = op.(FunctionDeclStmt).getId() or
       result = op.(ClassDeclStmt).getIdentifier()
     )
@@ -290,9 +245,7 @@ class ExportDefaultDeclaration extends ExportDeclaration, @exportdefaultdeclarat
 /** A named export declaration such as `export { x, y }` or `export var x = 42`. */
 class ExportNamedDeclaration extends ExportDeclaration, @exportnameddeclaration {
   /** Gets the operand statement or expression that is exported by this declaration. */
-  ExprOrStmt getOperand() {
-    result = getChild(-1)
-  }
+  ExprOrStmt getOperand() { result = getChild(-1) }
 
   /**
    * Gets an identifier, if any, exported as part of a declaration by this named export.
@@ -301,7 +254,7 @@ class ExportNamedDeclaration extends ExportDeclaration, @exportnameddeclaration
    * That is, it includes the `v` in `export var v` but not in `export {v}`.
    */
   Identifier getAnExportedDecl() {
-    exists (ExprOrStmt op | op = getOperand() |
+    exists(ExprOrStmt op | op = getOperand() |
       result = op.(DeclStmt).getADecl().getBindingPattern().getABindingVarRef() or
       result = op.(FunctionDeclStmt).getId() or
       result = op.(ClassDeclStmt).getIdentifier() or
@@ -314,16 +267,14 @@ class ExportNamedDeclaration extends ExportDeclaration, @exportnameddeclaration
   }
 
   /** Gets the variable declaration, if any, exported by this named export. */
-  VarDecl getADecl() {
-    result = getAnExportedDecl()
-  }
+  VarDecl getADecl() { result = getAnExportedDecl() }
 
   override predicate exportsAs(LexicalName v, string name) {
-    exists (LexicalDecl vd | vd = getAnExportedDecl() |
+    exists(LexicalDecl vd | vd = getAnExportedDecl() |
       name = vd.getName() and v = vd.getALexicalName()
     )
     or
-    exists (ExportSpecifier spec | spec = getASpecifier() and name = spec.getExportedName() |
+    exists(ExportSpecifier spec | spec = getASpecifier() and name = spec.getExportedName() |
       v = spec.getLocal().(LexicalAccess).getALexicalName()
       or
       this.(ReExportDeclaration).getImportedModule().exportsAs(v, spec.getLocalName())
@@ -331,33 +282,28 @@ class ExportNamedDeclaration extends ExportDeclaration, @exportnameddeclaration
   }
 
   override DataFlow::Node getSourceNode(string name) {
-    exists (VarDef d | d.getTarget() = getADecl() |
+    exists(VarDef d | d.getTarget() = getADecl() |
       name = d.getTarget().(VarDecl).getName() and
       result = DataFlow::valueNode(d.getSource())
-    ) or
-    exists (ExportSpecifier spec | spec = getASpecifier() and name = spec.getExportedName() |
+    )
+    or
+    exists(ExportSpecifier spec | spec = getASpecifier() and name = spec.getExportedName() |
       not exists(getImportedPath()) and result = DataFlow::valueNode(spec.getLocal())
       or
-      exists (ReExportDeclaration red | red = this |
+      exists(ReExportDeclaration red | red = this |
         result = red.getImportedModule().getAnExport().getSourceNode(spec.getLocalName())
       )
     )
   }
 
   /** Gets the module from which the exports are taken if this is a re-export. */
-  ConstantString getImportedPath() {
-    result = getChildExpr(-2)
-  }
+  ConstantString getImportedPath() { result = getChildExpr(-2) }
 
   /** Gets the `i`th export specifier of this declaration. */
-  ExportSpecifier getSpecifier(int i) {
-    result = getChildExpr(i)
-  }
+  ExportSpecifier getSpecifier(int i) { result = getChildExpr(i) }
 
   /** Gets an export specifier of this declaration. */
-  ExportSpecifier getASpecifier() {
-    result = getSpecifier(_)
-  }
+  ExportSpecifier getASpecifier() { result = getSpecifier(_) }
 
   override predicate isAmbient() {
     // An export such as `export declare function f()` should be seen as ambient.
@@ -368,19 +314,13 @@ class ExportNamedDeclaration extends ExportDeclaration, @exportnameddeclaration
 /** An export specifier in a named export declaration. */
 class ExportSpecifier extends Expr, @exportspecifier {
   /** Gets the declaration to which this specifier belongs. */
-  ExportDeclaration getExportDeclaration() {
-    result = getParent()
-  }
+  ExportDeclaration getExportDeclaration() { result = getParent() }
 
   /** Gets the local symbol that is being exported. */
-  Identifier getLocal() {
-    result = getChildExpr(0)
-  }
+  Identifier getLocal() { result = getChildExpr(0) }
 
   /** Gets the name under which the symbol is exported. */
-  Identifier getExported() {
-    result = getChildExpr(1)
-  }
+  Identifier getExported() { result = getChildExpr(1) }
 
   /**
    * Gets the local name of the exported symbol, that is, the name
@@ -431,17 +371,14 @@ class ExportSpecifier extends Expr, @exportspecifier {
 /**
  * A named export specifier, for example `v` in `export { v }`.
  */
-class NamedExportSpecifier extends ExportSpecifier, @namedexportspecifier {
-}
+class NamedExportSpecifier extends ExportSpecifier, @namedexportspecifier { }
 
 /**
  * A default export specifier, for example `default` in `export default 42`,
  * or `v` in `export v from "mod"`.
  */
 class ExportDefaultSpecifier extends ExportSpecifier, @exportdefaultspecifier {
-  override string getExportedName() {
-    result = "default"
-  }
+  override string getExportedName() { result = "default" }
 }
 
 /**
@@ -449,9 +386,7 @@ class ExportDefaultSpecifier extends ExportSpecifier, @exportdefaultspecifier {
  * `export v from "mod"`.
  */
 class ReExportDefaultSpecifier extends ExportDefaultSpecifier {
-  ReExportDefaultSpecifier() {
-    getExportDeclaration() instanceof ReExportDeclaration
-  }
+  ReExportDefaultSpecifier() { getExportDeclaration() instanceof ReExportDeclaration }
 
   override string getLocalName() { result = "default" }
 
@@ -461,8 +396,7 @@ class ReExportDefaultSpecifier extends ExportDefaultSpecifier {
 /**
  * A namespace export specifier, for example `*` in `export * from "mod"`.
  */
-class ExportNamespaceSpecifier extends ExportSpecifier, @exportnamespacespecifier {
-}
+class ExportNamespaceSpecifier extends ExportSpecifier, @exportnamespacespecifier { }
 
 /** An export declaration that re-exports declarations from another module. */
 abstract class ReExportDeclaration extends ExportDeclaration {
@@ -480,36 +414,35 @@ abstract class ReExportDeclaration extends ExportDeclaration {
    * Gets a module in a `node_modules/@types/` folder that matches the imported module name.
    */
   private Module resolveFromTypeRoot() {
-    result.getFile() = min(TypeRootFolder typeRoot ||
-      typeRoot.getModuleFile(getImportedPath().getStringValue())
-      order by typeRoot.getSearchPriority(getFile().getParentContainer()))
+    result.getFile() = min(TypeRootFolder typeRoot |
+        |
+        typeRoot.getModuleFile(getImportedPath().getStringValue())
+        order by
+          typeRoot.getSearchPriority(getFile().getParentContainer())
+      )
   }
 }
 
 /** A literal path expression appearing in a re-export declaration. */
 private class LiteralReExportPath extends PathExprInModule, ConstantString {
-  LiteralReExportPath() {
-    exists (ReExportDeclaration bred | this = bred.getImportedPath())
-  }
+  LiteralReExportPath() { exists(ReExportDeclaration bred | this = bred.getImportedPath()) }
 
   override string getValue() { result = this.(ConstantString).getStringValue() }
 }
 
 /** A named export declaration that re-exports symbols imported from another module. */
 class SelectiveReExportDeclaration extends ReExportDeclaration, ExportNamedDeclaration {
-  SelectiveReExportDeclaration() {
-    exists(ExportNamedDeclaration.super.getImportedPath())
-  }
+  SelectiveReExportDeclaration() { exists(ExportNamedDeclaration.super.getImportedPath()) }
 
   /** Gets the path of the module from which this declaration re-exports. */
-  override ConstantString getImportedPath() { result = ExportNamedDeclaration.super.getImportedPath() }
+  override ConstantString getImportedPath() {
+    result = ExportNamedDeclaration.super.getImportedPath()
+  }
 }
 
 /** An export declaration that exports zero or more declarations from the module it appears in. */
 class OriginalExportDeclaration extends ExportDeclaration {
-  OriginalExportDeclaration() {
-    not this instanceof ReExportDeclaration
-  }
+  OriginalExportDeclaration() { not this instanceof ReExportDeclaration }
 
   override predicate exportsAs(LexicalName v, string name) {
     this.(ExportDefaultDeclaration).exportsAs(v, name) or
diff --git a/javascript/ql/src/semmle/javascript/EmailClients.qll b/javascript/ql/src/semmle/javascript/EmailClients.qll
index ae6dd5a3eda6..7df4939bc9df 100644
--- a/javascript/ql/src/semmle/javascript/EmailClients.qll
+++ b/javascript/ql/src/semmle/javascript/EmailClients.qll
@@ -43,26 +43,18 @@ abstract class EmailSender extends DataFlow::DefaultSourceNode {
  */
 private class NodemailerEmailSender extends EmailSender, DataFlow::MethodCallNode {
   NodemailerEmailSender() {
-    this = DataFlow::moduleMember("nodemailer", "createTransport").getACall().getAMethodCall("sendMail")
+    this = DataFlow::moduleMember("nodemailer", "createTransport")
+          .getACall()
+          .getAMethodCall("sendMail")
   }
 
-  override DataFlow::Node getPlainTextBody() {
-    result = getOptionArgument(0, "text")
-  }
+  override DataFlow::Node getPlainTextBody() { result = getOptionArgument(0, "text") }
 
-  override DataFlow::Node getHtmlBody() {
-    result = getOptionArgument(0, "html")
-  }
+  override DataFlow::Node getHtmlBody() { result = getOptionArgument(0, "html") }
 
-  override DataFlow::Node getTo() {
-    result = getOptionArgument(0, "to")
-   }
+  override DataFlow::Node getTo() { result = getOptionArgument(0, "to") }
 
-  override DataFlow::Node getFrom() {
-    result = getOptionArgument(0, "from")
-   }
+  override DataFlow::Node getFrom() { result = getOptionArgument(0, "from") }
 
-  override DataFlow::Node getSubject() {
-    result = getOptionArgument(0, "subject")
-  }
+  override DataFlow::Node getSubject() { result = getOptionArgument(0, "subject") }
 }
diff --git a/javascript/ql/src/semmle/javascript/Errors.qll b/javascript/ql/src/semmle/javascript/Errors.qll
index 84917c02db0d..8e9257d376f2 100644
--- a/javascript/ql/src/semmle/javascript/Errors.qll
+++ b/javascript/ql/src/semmle/javascript/Errors.qll
@@ -4,31 +4,21 @@ import javascript
 
 /** An error encountered during extraction. */
 abstract class Error extends Locatable {
-  override Location getLocation() {
-    hasLocation(this, result)
-  }
+  override Location getLocation() { hasLocation(this, result) }
 
   /** Gets the message associated with this error. */
   abstract string getMessage();
 
-  override string toString() {
-    result = getMessage()
-  }
+  override string toString() { result = getMessage() }
 }
 
 /** A JavaScript parse error encountered during extraction. */
 class JSParseError extends @js_parse_error, Error {
   /** Gets the toplevel element this error occurs in. */
-  TopLevel getTopLevel() {
-    jsParseErrors(this, result, _, _)
-  }
+  TopLevel getTopLevel() { jsParseErrors(this, result, _, _) }
 
-  override string getMessage() {
-    jsParseErrors(this, _, result, _)
-  }
+  override string getMessage() { jsParseErrors(this, _, result, _) }
 
   /** Gets the source text of the line this error occurs on. */
-  string getLine() {
-    jsParseErrors(this, _, _, result)
-  }
+  string getLine() { jsParseErrors(this, _, _, result) }
 }
diff --git a/javascript/ql/src/semmle/javascript/Expr.qll b/javascript/ql/src/semmle/javascript/Expr.qll
index c78787948c06..247be5ae3917 100644
--- a/javascript/ql/src/semmle/javascript/Expr.qll
+++ b/javascript/ql/src/semmle/javascript/Expr.qll
@@ -7,41 +7,38 @@ import javascript
 /** A program element that is either an expression or a type annotation. */
 class ExprOrType extends @exprortype, Documentable {
   /** Gets the statement in which this expression or type appears. */
-  Stmt getEnclosingStmt() {
-    enclosingStmt(this, result)
-  }
+  Stmt getEnclosingStmt() { enclosingStmt(this, result) }
 
   /** Gets the function in which this expression or type appears, if any. */
-  Function getEnclosingFunction() {
-    result = getContainer()
-  }
+  Function getEnclosingFunction() { result = getContainer() }
 
   /**
    * Gets the statement container (function or toplevel) in which
    * this expression or type appears.
    */
-  StmtContainer getContainer() {
-    exprContainers(this, result)
-  }
+  StmtContainer getContainer() { exprContainers(this, result) }
 
   /**
    * Gets the JSDoc comment associated with this expression or type or its parent statement, if any.
    */
   override JSDoc getDocumentation() {
-    result = getOwnDocumentation() or
+    result = getOwnDocumentation()
+    or
     // if there is no JSDoc for the expression itself, check the enclosing property or statement
-    (not exists(getOwnDocumentation()) and
-     if getParent() instanceof Property then
-       result = getParent().(Property).getDocumentation()
-     else
-       result = getEnclosingStmt().getDocumentation())
+    (
+      not exists(getOwnDocumentation()) and
+      if getParent() instanceof Property
+      then result = getParent().(Property).getDocumentation()
+      else result = getEnclosingStmt().getDocumentation()
+    )
   }
 
   /** Gets a JSDoc comment that is immediately before this expression or type (ignoring parentheses). */
   private JSDoc getOwnDocumentation() {
-    exists (Token tk | tk = result.getComment().getNextToken() |
-      tk = this.getFirstToken() or
-      exists (Expr p | p.stripParens() = this | tk = p.getFirstToken())
+    exists(Token tk | tk = result.getComment().getNextToken() |
+      tk = this.getFirstToken()
+      or
+      exists(Expr p | p.stripParens() = this | tk = p.getFirstToken())
     )
   }
 
@@ -63,9 +60,7 @@ class ExprOrType extends @exprortype, Documentable {
    *
    * Also see `getUnderlyingValue` and `stripParens`.
    */
-  Expr getUnderlyingReference() {
-    none()
-  }
+  Expr getUnderlyingReference() { none() }
 
   /**
    * Gets the innermost expression that this expression evaluates to.
@@ -80,10 +75,7 @@ class ExprOrType extends @exprortype, Documentable {
    *
    * Also see `getUnderlyingReference` and `stripParens`.
    */
-  Expr getUnderlyingValue() {
-    result = this
-  }
-
+  Expr getUnderlyingValue() { result = this }
 }
 
 /** An expression. */
@@ -92,37 +84,25 @@ class Expr extends @expr, ExprOrStmt, ExprOrType, AST::ValueNode {
    * Gets the statement container (function or toplevel) in which
    * this expression appears.
    */
-  override StmtContainer getContainer() {
-    exprContainers(this, result)
-  }
+  override StmtContainer getContainer() { exprContainers(this, result) }
 
   /** Gets this expression, with any surrounding parentheses removed. */
-  override Expr stripParens() {
-    result = this
-  }
+  override Expr stripParens() { result = this }
 
   /** Gets the constant integer value this expression evaluates to, if any. */
-  int getIntValue() {
-    none()
-  }
+  int getIntValue() { none() }
 
   /** Gets the constant string value this expression evaluates to, if any. */
-  string getStringValue() {
-    none()
-  }
+  string getStringValue() { none() }
 
   /** Holds if this expression is impure, that is, its evaluation could have side effects. */
-  predicate isImpure() {
-    any()
-  }
+  predicate isImpure() { any() }
 
   /**
    * Holds if this expression is pure, that is, is its evaluation is guaranteed to be
    * side effect-free.
    */
-  predicate isPure() {
-    not isImpure()
-  }
+  predicate isPure() { not isImpure() }
 
   /**
    * Gets the kind of this expression, which is an integer value representing the expression's
@@ -131,13 +111,9 @@ class Expr extends @expr, ExprOrStmt, ExprOrType, AST::ValueNode {
    * _Note_: The mapping from node types to integers is considered an implementation detail
    * and may change between versions of the extractor.
    */
-  int getKind() {
-     exprs(this, result, _, _, _)
-  }
+  int getKind() { exprs(this, result, _, _, _) }
 
-  override string toString() {
-    exprs(this, _, _, _, result)
-  }
+  override string toString() { exprs(this, _, _, _, result) }
 
   /**
    * Gets the expression that is the parent of this expression in the AST, if any.
@@ -146,8 +122,9 @@ class Expr extends @expr, ExprOrStmt, ExprOrType, AST::ValueNode {
    * is returned, skipping the property node itself (which is not an expression).
    */
   Expr getParentExpr() {
-    this = result.getAChildExpr() or
-    exists (Property prop |
+    this = result.getAChildExpr()
+    or
+    exists(Property prop |
       result = prop.getParent() and
       this = prop.getAChildExpr()
     )
@@ -157,30 +134,22 @@ class Expr extends @expr, ExprOrStmt, ExprOrType, AST::ValueNode {
    * Holds if this expression accesses the global variable `g`, either directly
    * or through the `window` object.
    */
-  predicate accessesGlobal(string g) {
-    flow().accessesGlobal(g)
-  }
+  predicate accessesGlobal(string g) { flow().accessesGlobal(g) }
 
   /**
    * Holds if this expression may evaluate to `s`.
    */
-  predicate mayHaveStringValue(string s) {
-    flow().mayHaveStringValue(s)
-  }
+  predicate mayHaveStringValue(string s) { flow().mayHaveStringValue(s) }
 
   /**
    * Holds if this expression may evaluate to `b`.
    */
-  predicate mayHaveBooleanValue(boolean b) {
-    flow().mayHaveBooleanValue(b)
-  }
+  predicate mayHaveBooleanValue(boolean b) { flow().mayHaveBooleanValue(b) }
 
   /**
    * Holds if this expression may refer to the initial value of parameter `p`.
    */
-  predicate mayReferToParameter(Parameter p) {
-    flow().mayReferToParameter(p)
-  }
+  predicate mayReferToParameter(Parameter p) { flow().mayReferToParameter(p) }
 
   /**
    * Gets the static type of this expression, as determined by the TypeScript type system.
@@ -188,93 +157,64 @@ class Expr extends @expr, ExprOrStmt, ExprOrType, AST::ValueNode {
    * Has no result if the expression is in a JavaScript file or in a TypeScript
    * file that was extracted without type information.
    */
-  Type getType() {
-    ast_node_type(this, result)
-  }
+  Type getType() { ast_node_type(this, result) }
 }
 
 /** An identifier. */
 class Identifier extends @identifier, ExprOrType {
   /** Gets the name of this identifier. */
-  string getName() {
-    literals(result, _, this)
-  }
+  string getName() { literals(result, _, this) }
 }
 
 /**
  * A statement or property label, that is, an identifier that
  * does not refer to a variable.
  */
-class Label extends @label, Identifier, Expr {
-  override predicate isImpure() { none() }
-}
+class Label extends @label, Identifier, Expr { override predicate isImpure() { none() } }
 
 /** A literal. */
 class Literal extends @literal, Expr {
   /** Gets the value of this literal, as a string. */
-  string getValue() {
-    literals(result, _, this)
-  }
+  string getValue() { literals(result, _, this) }
 
   /**
    * Gets the raw source text of this literal, including quotes for
    * string literals.
    */
-  string getRawValue() {
-    literals(_, result, this)
-  }
+  string getRawValue() { literals(_, result, this) }
 
-  override predicate isImpure() {
-    none()
-  }
+  override predicate isImpure() { none() }
 }
 
 /** A parenthesized expression. */
 class ParExpr extends @parexpr, Expr {
   /** Gets the expression within parentheses. */
-  Expr getExpression() {
-    result = this.getChildExpr(0)
-  }
+  Expr getExpression() { result = this.getChildExpr(0) }
 
-  override Expr stripParens() {
-    result = getExpression().stripParens()
-  }
+  override Expr stripParens() { result = getExpression().stripParens() }
 
-  override int getIntValue() {
-    result = getExpression().getIntValue()
-  }
+  override int getIntValue() { result = getExpression().getIntValue() }
 
-  override predicate isImpure() {
-    getExpression().isImpure()
-  }
+  override predicate isImpure() { getExpression().isImpure() }
 
-  override Expr getUnderlyingValue() {
-    result = getExpression().getUnderlyingValue()
-  }
-
-  override Expr getUnderlyingReference() {
-    result = getExpression().getUnderlyingReference()
-  }
+  override Expr getUnderlyingValue() { result = getExpression().getUnderlyingValue() }
 
+  override Expr getUnderlyingReference() { result = getExpression().getUnderlyingReference() }
 }
 
 /** A `null` literal. */
-class NullLiteral extends @nullliteral, Literal {}
+class NullLiteral extends @nullliteral, Literal { }
 
 /** A Boolean literal, that is, either `true` or `false`. */
-class BooleanLiteral extends @booleanliteral, Literal {}
+class BooleanLiteral extends @booleanliteral, Literal { }
 
 /** A numeric literal. */
 class NumberLiteral extends @numberliteral, Literal {
   /** Gets the integer value of this literal. */
-  override int getIntValue() {
-    result = getValue().toInt()
-  }
+  override int getIntValue() { result = getValue().toInt() }
 
   /** Gets the floating point value of this literal. */
-  float getFloatValue() {
-    result = getValue().toFloat()
-  }
+  float getFloatValue() { result = getValue().toFloat() }
 }
 
 /** A bigint literal. */
@@ -283,72 +223,50 @@ class BigIntLiteral extends @bigintliteral, Literal {
    * Gets the integer value of this literal if it can be represented
    * as a QL integer value.
    */
-  override int getIntValue() {
-    result = getValue().toInt()
-  }
+  override int getIntValue() { result = getValue().toInt() }
 
   /**
    * Gets the floating point value of this literal if it can be represented
    * as a QL floating point value.
    */
-  float getFloatValue() {
-    result = getValue().toFloat()
-  }
+  float getFloatValue() { result = getValue().toFloat() }
 }
 
 /** A string literal. */
 class StringLiteral extends @stringliteral, Literal {
-  override string getStringValue() {
-    result = getValue()
-  }
+  override string getStringValue() { result = getValue() }
 }
 
 /** A regular expression literal. */
 class RegExpLiteral extends @regexpliteral, Literal, RegExpParent {
   /** Gets the root term of this regular expression literal. */
-  RegExpTerm getRoot() {
-    this = result.getParent()
-  }
+  RegExpTerm getRoot() { this = result.getParent() }
 
   /** Gets the flags of this regular expression. */
-  string getFlags() {
-    result = getValue().regexpCapture(".*/(\\w*)$", 1)
-  }
+  string getFlags() { result = getValue().regexpCapture(".*/(\\w*)$", 1) }
 
   /** Holds if this regular expression has an `m` flag. */
-  predicate isMultiline() {
-    getFlags().matches("%m%")
-  }
+  predicate isMultiline() { getFlags().matches("%m%") }
 
   /** Holds if this regular expression has a `g` flag. */
-  predicate isGlobal() {
-    getFlags().matches("%g%")
-  }
+  predicate isGlobal() { getFlags().matches("%g%") }
 
   /** Holds if this regular expression has an `i` flag. */
-  predicate isIgnoreCase() {
-    getFlags().matches("%i%")
-  }
+  predicate isIgnoreCase() { getFlags().matches("%i%") }
 
   /** Holds if this regular expression has an `s` flag. */
-  predicate isDotAll() {
-    getFlags().matches("%s%")
-  }
+  predicate isDotAll() { getFlags().matches("%s%") }
 }
 
 /** A `this` expression. */
 class ThisExpr extends @thisexpr, Expr {
-  override predicate isImpure() {
-    none()
-  }
+  override predicate isImpure() { none() }
 
   /**
    * Gets the function whose `this` binding this expression refers to,
    * which is the nearest enclosing non-arrow function.
    */
-  Function getBinder() {
-    result = getEnclosingFunction().getThisBinder()
-  }
+  Function getBinder() { result = getEnclosingFunction().getThisBinder() }
 
   /**
    * Gets the function or top-level whose `this` binding this expression refers to,
@@ -364,60 +282,42 @@ class ThisExpr extends @thisexpr, Expr {
 /** An array literal. */
 class ArrayExpr extends @arrayexpr, Expr {
   /** Gets the `i`th element of this array literal. */
-  Expr getElement(int i) {
-    result = this.getChildExpr(i)
-  }
+  Expr getElement(int i) { result = this.getChildExpr(i) }
 
   /** Gets an element of this array literal. */
-  Expr getAnElement() {
-    result = this.getAChildExpr()
-  }
+  Expr getAnElement() { result = this.getAChildExpr() }
 
   /** Gets the number of elements in this array literal. */
-  int getSize() {
-    arraySize(this, result)
-  }
+  int getSize() { arraySize(this, result) }
 
   /**
    * Holds if this array literal includes a trailing comma after the
    * last element.
    */
-  predicate hasTrailingComma() {
-    this.getLastToken().getPreviousToken().getValue() = ","
-  }
+  predicate hasTrailingComma() { this.getLastToken().getPreviousToken().getValue() = "," }
 
   /** Holds if the `i`th element of this array literal is omitted. */
   predicate elementIsOmitted(int i) {
-    i in [0..getSize()-1] and
-    not exists (getElement(i))
+    i in [0 .. getSize() - 1] and
+    not exists(getElement(i))
   }
 
   /** Holds if this array literal has an omitted element. */
-  predicate hasOmittedElement() {
-    elementIsOmitted(_)
-  }
+  predicate hasOmittedElement() { elementIsOmitted(_) }
 
-  override predicate isImpure() {
-    getAnElement().isImpure()
-  }
+  override predicate isImpure() { getAnElement().isImpure() }
 }
 
 /** An object literal. */
 class ObjectExpr extends @objexpr, Expr {
   /** Gets the `i`th property in this object literal. */
-  Property getProperty(int i) {
-    properties(result, this, i, _, _)
-  }
+  Property getProperty(int i) { properties(result, this, i, _, _) }
 
   /** Gets a property in this object literal. */
-  Property getAProperty() {
-    exists (int i | result = this.getProperty(i))
-  }
+  Property getAProperty() { exists(int i | result = this.getProperty(i)) }
 
   /** Gets the number of properties in this object literal. */
-  int getNumProperty() {
-    result = count(this.getAProperty())
-  }
+  int getNumProperty() { result = count(this.getAProperty()) }
 
   /** Gets the property with the given name, if any. */
   Property getPropertyByName(string name) {
@@ -429,13 +329,9 @@ class ObjectExpr extends @objexpr, Expr {
    * Holds if this object literal includes a trailing comma after the
    * last property.
    */
-  predicate hasTrailingComma() {
-    this.getLastToken().getPreviousToken().getValue() = ","
-  }
+  predicate hasTrailingComma() { this.getLastToken().getPreviousToken().getValue() = "," }
 
-  override predicate isImpure() {
-    getAProperty().isImpure()
-  }
+  override predicate isImpure() { getAProperty().isImpure() }
 }
 
 /**
@@ -445,7 +341,7 @@ class ObjectExpr extends @objexpr, Expr {
 class Property extends @property, Documentable {
   Property() {
     // filter out property patterns and JSX attributes
-    exists (ObjectExpr obj | properties(this, obj, _, _, _))
+    exists(ObjectExpr obj | properties(this, obj, _, _, _))
   }
 
   /**
@@ -455,66 +351,51 @@ class Property extends @property, Documentable {
    * numeric literal; for computed properties it can be an arbitrary expression;
    * for spread properties, it is not defined.
    */
-  Expr getNameExpr() {
-    result = this.getChildExpr(0)
-  }
+  Expr getNameExpr() { result = this.getChildExpr(0) }
 
   /** Gets the expression specifying the initial value of this property. */
-  Expr getInit() {
-    result = this.getChildExpr(1)
-  }
+  Expr getInit() { result = this.getChildExpr(1) }
 
   /** Gets the name of this property. */
   string getName() {
-    not isComputed() and result = getNameExpr().(Identifier).getName() or
+    not isComputed() and result = getNameExpr().(Identifier).getName()
+    or
     result = getNameExpr().(Literal).getValue()
   }
 
   /** Holds if the name of this property is computed. */
-  predicate isComputed() {
-    isComputed(this)
-  }
+  predicate isComputed() { isComputed(this) }
 
   /** Holds if this property is defined using method syntax. */
-  predicate isMethod() {
-    isMethod(this)
-  }
+  predicate isMethod() { isMethod(this) }
 
   /** Holds if this property is defined using shorthand syntax. */
-  predicate isShorthand() {
-    getNameExpr().getLocation() = getInit().getLocation()
-  }
+  predicate isShorthand() { getNameExpr().getLocation() = getInit().getLocation() }
 
   /** Gets the object literal this property belongs to. */
-  ObjectExpr getObjectExpr() {
-    properties(this, result, _, _, _)
-  }
+  ObjectExpr getObjectExpr() { properties(this, result, _, _, _) }
 
   /** Gets the (0-based) index at which this property appears in its enclosing literal. */
-  int getIndex() {
-    this = getObjectExpr().getProperty(result)
-  }
+  int getIndex() { this = getObjectExpr().getProperty(result) }
 
   /** Gets the function or toplevel in which this property occurs. */
-  StmtContainer getContainer() {
-    result = getObjectExpr().getContainer()
-  }
+  StmtContainer getContainer() { result = getObjectExpr().getContainer() }
 
   /**
    * Holds if this property is impure, that is, the evaluation of its name or
    * its initializer expression could have side effects.
    */
   predicate isImpure() {
-    (isComputed() and getNameExpr().isImpure()) or
+    (isComputed() and getNameExpr().isImpure())
+    or
     getInit().isImpure()
   }
 
-  override string toString() {
-    properties(this, _, _, _, result)
-  }
+  override string toString() { properties(this, _, _, _, result) }
 
   override ControlFlowNode getFirstControlFlowNode() {
-    result = getNameExpr().getFirstControlFlowNode() or
+    result = getNameExpr().getFirstControlFlowNode()
+    or
     not exists(getNameExpr()) and result = getInit().getFirstControlFlowNode()
   }
 
@@ -523,9 +404,7 @@ class Property extends @property, Documentable {
    * value indicating whether this property is a value property,
    * a property getter, or a property setter.
    */
-  int getKind() {
-    properties(this, _, _, result, _)
-  }
+  int getKind() { properties(this, _, _, result, _) }
 
   /**
    * Gets the `i`th decorator applied to this property.
@@ -533,9 +412,7 @@ class Property extends @property, Documentable {
    * For example, the property `@A @B x: 42` has
    * `@A` as its 0th decorator, and `@B` as its first decorator.
    */
-  Decorator getDecorator(int i) {
-    result = getChildExpr(-(i+1))
-  }
+  Decorator getDecorator(int i) { result = getChildExpr(-(i + 1)) }
 
   /**
    * Gets a decorator applied to this property.
@@ -543,154 +420,98 @@ class Property extends @property, Documentable {
    * For example, the property `@A @B x: 42` has
    * decorators `@A` and `@B`.
    */
-  Decorator getADecorator() {
-    result = getDecorator(_)
-  }
+  Decorator getADecorator() { result = getDecorator(_) }
 }
 
 /** A value property in an object literal. */
-class ValueProperty extends Property, @value_property {
-}
+class ValueProperty extends Property, @value_property { }
 
 /** A property getter or setter in an object literal. */
 class PropertyAccessor extends Property, @property_accessor {
-  override FunctionExpr getInit() {
-    result = Property.super.getInit()
-  }
+  override FunctionExpr getInit() { result = Property.super.getInit() }
 }
 
 /** A property getter in an object literal. */
-class PropertyGetter extends PropertyAccessor, @property_getter {
-}
+class PropertyGetter extends PropertyAccessor, @property_getter { }
 
 /** A property setter in an object literal. */
-class PropertySetter extends PropertyAccessor, @property_setter {
-}
+class PropertySetter extends PropertyAccessor, @property_setter { }
 
 /**
  * A spread property in an object literal, such as `...others` in
  * `{ x: 42, ...others }`. The value of a spread property is always
  * a `SpreadElement`.
  */
-class SpreadProperty extends Property {
-  SpreadProperty() {
-    not exists(getNameExpr())
-  }
-}
+class SpreadProperty extends Property { SpreadProperty() { not exists(getNameExpr()) } }
 
 /** A function expression. */
 class FunctionExpr extends @functionexpr, Expr, Function {
   /** Gets the name of this function expression, if any. */
-  override string getName() {
-    result = getId().getName()
-  }
+  override string getName() { result = getId().getName() }
 
   /** Holds if this function expression is a property setter. */
-  predicate isSetter() {
-    exists (PropertySetter s | s.getInit() = this)
-  }
+  predicate isSetter() { exists(PropertySetter s | s.getInit() = this) }
 
   /** Holds if this function expression is a property getter. */
-  predicate isGetter() {
-    exists (PropertyGetter g | g.getInit() = this)
-  }
+  predicate isGetter() { exists(PropertyGetter g | g.getInit() = this) }
 
   /** Holds if this function expression is a property accessor. */
-  predicate isAccessor() {
-    exists (PropertyAccessor acc | acc.getInit() = this)
-  }
+  predicate isAccessor() { exists(PropertyAccessor acc | acc.getInit() = this) }
 
   /** Gets the statement in which this function expression appears. */
-  override Stmt getEnclosingStmt() {
-    result = Expr.super.getEnclosingStmt()
-  }
+  override Stmt getEnclosingStmt() { result = Expr.super.getEnclosingStmt() }
 
-  override StmtContainer getEnclosingContainer() {
-    result = Expr.super.getContainer()
-  }
+  override StmtContainer getEnclosingContainer() { result = Expr.super.getContainer() }
 
-  override predicate isImpure() {
-    none()
-  }
+  override predicate isImpure() { none() }
 }
 
 /** An arrow expression. */
 class ArrowFunctionExpr extends @arrowfunctionexpr, Expr, Function {
   /** Gets the statement in which this expression appears. */
-  override Stmt getEnclosingStmt() {
-    result = Expr.super.getEnclosingStmt()
-  }
+  override Stmt getEnclosingStmt() { result = Expr.super.getEnclosingStmt() }
 
-  override StmtContainer getEnclosingContainer() {
-    result = Expr.super.getContainer()
-  }
+  override StmtContainer getEnclosingContainer() { result = Expr.super.getContainer() }
 
-  override predicate isImpure() {
-    none()
-  }
+  override predicate isImpure() { none() }
 
-  override Function getThisBinder() {
-    result = getEnclosingContainer().(Function).getThisBinder()
-  }
+  override Function getThisBinder() { result = getEnclosingContainer().(Function).getThisBinder() }
 }
 
 /** A sequence expression (also known as comma expression). */
 class SeqExpr extends @seqexpr, Expr {
   /** Gets the `i`th expression in this sequence. */
-  Expr getOperand(int i) {
-    result = getChildExpr(i)
-  }
+  Expr getOperand(int i) { result = getChildExpr(i) }
 
   /** Gets an expression in this sequence. */
-  Expr getAnOperand() {
-    result = getOperand(_)
-  }
+  Expr getAnOperand() { result = getOperand(_) }
 
   /** Gets the number of expressions in this sequence. */
-  int getNumOperands() {
-    result = count(getOperand(_))
-  }
+  int getNumOperands() { result = count(getOperand(_)) }
 
   /** Gets the last expression in this sequence. */
-  Expr getLastOperand() {
-    result = getOperand(getNumOperands()-1)
-  }
+  Expr getLastOperand() { result = getOperand(getNumOperands() - 1) }
 
-  override predicate isImpure() {
-    getAnOperand().isImpure()
-  }
-
-  override string getStringValue() {
-    result = getLastOperand().getStringValue()
-  }
+  override predicate isImpure() { getAnOperand().isImpure() }
 
-  override Expr getUnderlyingValue() {
-    result = getLastOperand().getUnderlyingValue()
-  }
+  override string getStringValue() { result = getLastOperand().getStringValue() }
 
+  override Expr getUnderlyingValue() { result = getLastOperand().getUnderlyingValue() }
 }
 
 /** A conditional expression. */
 class ConditionalExpr extends @conditionalexpr, Expr {
   /** Gets the condition expression of this conditional. */
-  Expr getCondition() {
-    result = getChildExpr(0)
-  }
+  Expr getCondition() { result = getChildExpr(0) }
 
   /** Gets the 'then' expression of this conditional. */
-  Expr getConsequent() {
-    result = getChildExpr(1)
-  }
+  Expr getConsequent() { result = getChildExpr(1) }
 
   /** Gets the 'else' expression of this conditional. */
-  Expr getAlternate() {
-    result = getChildExpr(2)
-  }
+  Expr getAlternate() { result = getChildExpr(2) }
 
   /** Gets either the 'then' or the 'else' expression of this conditional. */
-  Expr getABranch() {
-    result = getConsequent() or result = getAlternate()
-  }
+  Expr getABranch() { result = getConsequent() or result = getAlternate() }
 
   override predicate isImpure() {
     getCondition().isImpure() or
@@ -704,52 +525,36 @@ class ConditionalExpr extends @conditionalexpr, Expr {
  */
 class InvokeExpr extends @invokeexpr, Expr {
   /** Gets the expression specifying the function to be called. */
-  Expr getCallee() {
-    result = this.getChildExpr(-1)
-  }
+  Expr getCallee() { result = this.getChildExpr(-1) }
 
   /** Gets the name of the function or method being invoked, if it can be determined. */
   string getCalleeName() {
-    exists (Expr callee | callee = getCallee().getUnderlyingValue() |
-      result = ((Identifier)callee).getName() or
-      result = ((PropAccess)callee).getPropertyName()
+    exists(Expr callee | callee = getCallee().getUnderlyingValue() |
+      result = (callee.(Identifier)).getName() or
+      result = (callee.(PropAccess)).getPropertyName()
     )
   }
 
   /** Gets the `i`th argument of this invocation. */
-  Expr getArgument(int i) {
-    i >= 0 and result = this.getChildExpr(i)
-  }
+  Expr getArgument(int i) { i >= 0 and result = this.getChildExpr(i) }
 
   /** Gets an argument of this invocation. */
-  Expr getAnArgument() {
-    result = getArgument(_)
-  }
+  Expr getAnArgument() { result = getArgument(_) }
 
   /** Gets the last argument of this invocation, if any. */
-  Expr getLastArgument() {
-    result = getArgument(getNumArgument()-1)
-  }
+  Expr getLastArgument() { result = getArgument(getNumArgument() - 1) }
 
   /** Gets the number of arguments of this invocation. */
-  int getNumArgument() {
-    result = count(getAnArgument())
-  }
+  int getNumArgument() { result = count(getAnArgument()) }
 
   /** Gets the `i`th type argument of this invocation. */
-  TypeExpr getTypeArgument(int i) {
-    i >= 0 and result = this.getChildTypeExpr(-i - 2)
-  }
+  TypeExpr getTypeArgument(int i) { i >= 0 and result = this.getChildTypeExpr(-i - 2) }
 
   /** Gets a type argument of this invocation. */
-  TypeExpr getATypeArgument() {
-      result = getTypeArgument(_)
-  }
+  TypeExpr getATypeArgument() { result = getTypeArgument(_) }
 
   /** Gets the number of type arguments of this invocation. */
-  int getNumTypeArgument() {
-      result = count(getATypeArgument())
-  }
+  int getNumTypeArgument() { result = count(getATypeArgument()) }
 
   override ControlFlowNode getFirstControlFlowNode() {
     result = getCallee().getFirstControlFlowNode()
@@ -759,7 +564,7 @@ class InvokeExpr extends @invokeexpr, Expr {
   predicate hasTrailingComma() {
     // check whether the last token of this invocation is a closing
     // parenthesis, which itself is preceded by a comma
-    exists (PunctuatorToken rparen | rparen.getValue() = ")" |
+    exists(PunctuatorToken rparen | rparen.getValue() = ")" |
       rparen = getLastToken() and
       rparen.getPreviousToken().getValue() = ","
     )
@@ -768,9 +573,7 @@ class InvokeExpr extends @invokeexpr, Expr {
   /**
    * Holds if the `i`th argument of this invocation is a spread element.
    */
-  predicate isSpreadArgument(int i) {
-    getArgument(i).stripParens() instanceof SpreadElement
-  }
+  predicate isSpreadArgument(int i) { getArgument(i).stripParens() instanceof SpreadElement }
 
   /**
    * Holds if the `i`th argument of this invocation is an object literal whose property
@@ -788,9 +591,7 @@ class InvokeExpr extends @invokeexpr, Expr {
    *
    * This predicate is only populated for files extracted with full TypeScript extraction.
    */
-  CallSignatureType getResolvedSignature() {
-    invoke_expr_signature(this, result)
-  }
+  CallSignatureType getResolvedSignature() { invoke_expr_signature(this, result) }
 
   /**
    * Gets the index of the targeted call signature among the overload signatures
@@ -798,18 +599,14 @@ class InvokeExpr extends @invokeexpr, Expr {
    *
    * This predicate is only populated for files extracted with full TypeScript extraction.
    */
-  int getResolvedOverloadIndex() {
-    invoke_expr_overload_index(this, result)
-  }
+  int getResolvedOverloadIndex() { invoke_expr_overload_index(this, result) }
 
   /**
    * Gets the canonical name of the static call target, as determined by the TypeScript type system.
    *
    * This predicate is only populated for files extracted with full TypeScript extraction.
    */
-  CanonicalFunctionName getResolvedCalleeName() {
-    ast_node_symbol(this, result)
-  }
+  CanonicalFunctionName getResolvedCalleeName() { ast_node_symbol(this, result) }
 
   /**
    * Gets the statically resolved target function, as determined by the TypeScript type system, if any.
@@ -817,15 +614,13 @@ class InvokeExpr extends @invokeexpr, Expr {
    * This predicate is only populated for files extracted with full TypeScript extraction.
    *
    * Note that the resolved function may be overridden in a subclass and thus is not
-   * necessarily the actual target of this invocation at runtime. 
+   * necessarily the actual target of this invocation at runtime.
    */
-  Function getResolvedCallee() {
-    result = getResolvedCalleeName().getImplementation()
-  }
+  Function getResolvedCallee() { result = getResolvedCalleeName().getImplementation() }
 }
 
 /** A `new` expression. */
-class NewExpr extends @newexpr, InvokeExpr {}
+class NewExpr extends @newexpr, InvokeExpr { }
 
 /** A function call expression. */
 class CallExpr extends @callexpr, InvokeExpr {
@@ -833,42 +628,30 @@ class CallExpr extends @callexpr, InvokeExpr {
    * Gets the expression specifying the receiver on which the function
    * is invoked, if any.
    */
-  Expr getReceiver() {
-    result = getCallee().(PropAccess).getBase()
-  }
+  Expr getReceiver() { result = getCallee().(PropAccess).getBase() }
 }
 
 /** A method call expression. */
 class MethodCallExpr extends CallExpr {
-  MethodCallExpr() {
-    getCallee().stripParens() instanceof PropAccess
-  }
+  MethodCallExpr() { getCallee().stripParens() instanceof PropAccess }
 
   /**
    * Gets the property access referencing the method to be invoked.
    */
-  private PropAccess getMethodRef() {
-    result = getCallee().stripParens()
-  }
+  private PropAccess getMethodRef() { result = getCallee().stripParens() }
 
   /**
    * Gets the receiver expression of this method call.
    */
-  override Expr getReceiver() {
-    result = getMethodRef().getBase()
-  }
+  override Expr getReceiver() { result = getMethodRef().getBase() }
 
   /**
    * Gets the name of the invoked method, if it can be determined.
    */
-  string getMethodName() {
-    result = getMethodRef().getPropertyName()
-  }
+  string getMethodName() { result = getMethodRef().getPropertyName() }
 
   /** Holds if this invocation calls method `m` on expression `base`. */
-  predicate calls(Expr base, string m) {
-    getMethodRef().accesses(base, m)
-  }
+  predicate calls(Expr base, string m) { getMethodRef().accesses(base, m) }
 }
 
 /**
@@ -877,29 +660,24 @@ class MethodCallExpr extends CallExpr {
  */
 class PropAccess extends @propaccess, Expr {
   /** Gets the base expression on which the property is accessed. */
-  Expr getBase() {
-    result = getChildExpr(0)
-  }
+  Expr getBase() { result = getChildExpr(0) }
 
   /**
    * Gets the expression specifying the name of the property being
    * read or written. For dot expressions, this is an identifier; for
    * index expressions it can be an arbitrary expression.
    */
-  Expr getPropertyNameExpr() {
-    result = getChildExpr(1)
-  }
+  Expr getPropertyNameExpr() { result = getChildExpr(1) }
 
   /** Gets the name of the accessed property, if it can be determined. */
-  string getPropertyName() {
-    none()
-  }
+  string getPropertyName() { none() }
 
   /** Gets the qualified name of the accessed property, if it can be determined. */
   string getQualifiedName() {
-    exists (string basename |
+    exists(string basename |
       basename = getBase().(Identifier).getName() or
-      basename = getBase().(PropAccess).getQualifiedName() |
+      basename = getBase().(PropAccess).getQualifiedName()
+    |
       result = basename + "." + getPropertyName()
     )
   }
@@ -914,38 +692,25 @@ class PropAccess extends @propaccess, Expr {
     result = getBase().getFirstControlFlowNode()
   }
 
-  override Expr getUnderlyingReference() {
-    result = this
-  }
-
+  override Expr getUnderlyingReference() { result = this }
 }
 
 /** A dot expression. */
 class DotExpr extends @dotexpr, PropAccess {
-  override string getPropertyName() {
-    result = getProperty().getName()
-  }
+  override string getPropertyName() { result = getProperty().getName() }
 
   /** Gets the identifier specifying the name of the accessed property. */
-  Identifier getProperty() {
-   result = getChildExpr(1)
-  }
+  Identifier getProperty() { result = getChildExpr(1) }
 
-  override predicate isImpure() {
-    getBase().isImpure()
-  }
+  override predicate isImpure() { getBase().isImpure() }
 }
 
 /** An index expression (also known as computed property access). */
 class IndexExpr extends @indexexpr, PropAccess {
   /** Gets the expression specifying the name of the accessed property. */
-  Expr getIndex() {
-    result = getChildExpr(1)
-  }
+  Expr getIndex() { result = getChildExpr(1) }
 
-  override string getPropertyName() {
-    result = ((Literal)getIndex()).getValue()
-  }
+  override string getPropertyName() { result = (getIndex().(Literal)).getValue() }
 
   override predicate isImpure() {
     getBase().isImpure() or
@@ -956,18 +721,12 @@ class IndexExpr extends @indexexpr, PropAccess {
 /** An expression with a unary operator. */
 class UnaryExpr extends @unaryexpr, Expr {
   /** Gets the operand of this unary operator. */
-  Expr getOperand() {
-    result = getChildExpr(0)
-  }
+  Expr getOperand() { result = getChildExpr(0) }
 
   /** Gets the operator of this expression. */
-  string getOperator() {
-    none()
-  }
+  string getOperator() { none() }
 
-  override predicate isImpure() {
-    getOperand().isImpure()
-  }
+  override predicate isImpure() { getOperand().isImpure() }
 
   override ControlFlowNode getFirstControlFlowNode() {
     result = getOperand().getFirstControlFlowNode()
@@ -976,84 +735,50 @@ class UnaryExpr extends @unaryexpr, Expr {
 
 /** An arithmetic negation expression (also known as unary minus). */
 class NegExpr extends @negexpr, UnaryExpr {
-  override string getOperator() {
-    result = "-"
-  }
+  override string getOperator() { result = "-" }
 
-  override int getIntValue() {
-    result = -getOperand().getIntValue()
-  }
+  override int getIntValue() { result = -getOperand().getIntValue() }
 }
 
 /** A unary plus expression. */
-class PlusExpr extends @plusexpr, UnaryExpr {
-  override string getOperator() {
-    result = "+"
-  }
-}
+class PlusExpr extends @plusexpr, UnaryExpr { override string getOperator() { result = "+" } }
 
 /** A logical negation expression. */
-class LogNotExpr extends @lognotexpr, UnaryExpr {
-  override string getOperator() {
-    result = "!"
-  }
-}
+class LogNotExpr extends @lognotexpr, UnaryExpr { override string getOperator() { result = "!" } }
 
 /** A bitwise negation expression. */
-class BitNotExpr extends @bitnotexpr, UnaryExpr {
-  override string getOperator() {
-    result = "~"
-  }
-}
+class BitNotExpr extends @bitnotexpr, UnaryExpr { override string getOperator() { result = "~" } }
 
 /** A `typeof` expression. */
 class TypeofExpr extends @typeofexpr, UnaryExpr {
-  override string getOperator() {
-    result = "typeof"
-  }
+  override string getOperator() { result = "typeof" }
 }
 
 /** A `void` expression. */
-class VoidExpr extends @voidexpr, UnaryExpr {
-  override string getOperator() {
-    result = "void"
-  }
-}
+class VoidExpr extends @voidexpr, UnaryExpr { override string getOperator() { result = "void" } }
 
 /** A `delete` expression. */
 class DeleteExpr extends @deleteexpr, UnaryExpr {
-  override string getOperator() {
-    result = "delete"
-  }
+  override string getOperator() { result = "delete" }
 
-  override predicate isImpure() {
-    any()
-  }
+  override predicate isImpure() { any() }
 }
 
 /** A spread element. */
 class SpreadElement extends @spreadelement, UnaryExpr {
-  override string getOperator() {
-    result = "..."
-  }
+  override string getOperator() { result = "..." }
 }
 
 /** An expression with a binary operator. */
 class BinaryExpr extends @binaryexpr, Expr {
   /** Gets the left operand of this binary operator. */
-  Expr getLeftOperand() {
-    result = getChildExpr(0)
-  }
+  Expr getLeftOperand() { result = getChildExpr(0) }
 
   /** Gets the right operand of this binary operator. */
-  Expr getRightOperand() {
-    result = getChildExpr(1)
-  }
+  Expr getRightOperand() { result = getChildExpr(1) }
 
   /** Gets an operand of this binary operator. */
-  Expr getAnOperand() {
-    result = getAChildExpr()
-  }
+  Expr getAnOperand() { result = getAChildExpr() }
 
   /** Holds if `e` and `f` (in either order) are the two operands of this expression. */
   predicate hasOperands(Expr e, Expr f) {
@@ -1063,13 +788,9 @@ class BinaryExpr extends @binaryexpr, Expr {
   }
 
   /** Gets the operator of this expression. */
-  string getOperator() {
-    none()
-  }
+  string getOperator() { none() }
 
-  override predicate isImpure() {
-    getAnOperand().isImpure()
-  }
+  override predicate isImpure() { getAnOperand().isImpure() }
 
   override ControlFlowNode getFirstControlFlowNode() {
     result = getLeftOperand().getFirstControlFlowNode()
@@ -1082,15 +803,15 @@ class BinaryExpr extends @binaryexpr, Expr {
    * amount of whitespace before and after the operator are the same.
    */
   int getWhitespaceAroundOperator() {
-    exists (Token lastLeft, Token operator, Token firstRight, int l, int c1, int c2, int c3, int c4 |
+    exists(Token lastLeft, Token operator, Token firstRight, int l, int c1, int c2, int c3, int c4 |
       lastLeft = getLeftOperand().getLastToken() and
       operator = lastLeft.getNextToken() and
       firstRight = operator.getNextToken() and
       lastLeft.getLocation().hasLocationInfo(_, _, _, l, c1) and
       operator.getLocation().hasLocationInfo(_, l, c2, l, c3) and
       firstRight.getLocation().hasLocationInfo(_, l, c4, _, _) and
-      result = c2-c1-1 and
-      result = c4-c3-1
+      result = c2 - c1 - 1 and
+      result = c4 - c3 - 1
     )
   }
 }
@@ -1100,100 +821,62 @@ class BinaryExpr extends @binaryexpr, Expr {
  * (`==`, `!=`, `===`, `!==`) or a relational expression
  * (`<`, `<=`, `>=`, `>`).
  */
-class Comparison extends @comparison, BinaryExpr {}
+class Comparison extends @comparison, BinaryExpr { }
 
 /** An equality test using `==`, `!=`, `===` or `!==`. */
 class EqualityTest extends @equalitytest, Comparison {
   /** Gets the polarity of this test: `true` for equalities, `false` for inequalities. */
   boolean getPolarity() {
-    (this instanceof EqExpr or this instanceof StrictEqExpr) and result = true
+    (this instanceof EqExpr or this instanceof StrictEqExpr) and
+    result = true
     or
-    (this instanceof NEqExpr or this instanceof StrictNEqExpr) and result = false
+    (this instanceof NEqExpr or this instanceof StrictNEqExpr) and
+    result = false
   }
 }
 
 /** An equality test using `==`. */
-class EqExpr extends @eqexpr, EqualityTest {
-  override string getOperator() {
-    result = "=="
-  }
-}
+class EqExpr extends @eqexpr, EqualityTest { override string getOperator() { result = "==" } }
 
 /** An inequality test using `!=`. */
-class NEqExpr extends @neqexpr, EqualityTest {
-  override string getOperator() {
-    result = "!="
-  }
-}
+class NEqExpr extends @neqexpr, EqualityTest { override string getOperator() { result = "!=" } }
 
 /** A strict equality test using `===`. */
 class StrictEqExpr extends @eqqexpr, EqualityTest {
-  override string getOperator() {
-    result = "==="
-  }
+  override string getOperator() { result = "===" }
 }
 
 /** A strict inequality test using `!==`. */
 class StrictNEqExpr extends @neqqexpr, EqualityTest {
-  override string getOperator() {
-    result = "!=="
-  }
+  override string getOperator() { result = "!==" }
 }
 
 /** A less-than expression. */
-class LTExpr extends @ltexpr, Comparison {
-  override string getOperator() {
-    result = "<"
-  }
-}
+class LTExpr extends @ltexpr, Comparison { override string getOperator() { result = "<" } }
 
 /** A less-than-or-equal expression. */
-class LEExpr extends @leexpr, Comparison {
-  override string getOperator() {
-    result = "<="
-  }
-}
+class LEExpr extends @leexpr, Comparison { override string getOperator() { result = "<=" } }
 
 /** A greater-than expression. */
-class GTExpr extends @gtexpr, Comparison {
-  override string getOperator() {
-    result = ">"
-  }
-}
+class GTExpr extends @gtexpr, Comparison { override string getOperator() { result = ">" } }
 
 /** A greater-than-or-equal expression. */
-class GEExpr extends @geexpr, Comparison {
-  override string getOperator() {
-    result = ">="
-  }
-}
+class GEExpr extends @geexpr, Comparison { override string getOperator() { result = ">=" } }
 
 /** A left-shift expression using `<<`. */
-class LShiftExpr extends @lshiftexpr, BinaryExpr {
-  override string getOperator() {
-    result = "<<"
-  }
-}
+class LShiftExpr extends @lshiftexpr, BinaryExpr { override string getOperator() { result = "<<" } }
 
 /** A right-shift expression using `>>`. */
-class RShiftExpr extends @rshiftexpr, BinaryExpr {
-  override string getOperator() {
-    result = ">>"
-  }
-}
+class RShiftExpr extends @rshiftexpr, BinaryExpr { override string getOperator() { result = ">>" } }
 
 /** An unsigned right-shift expression using `>>>`. */
 class URShiftExpr extends @urshiftexpr, BinaryExpr {
-  override string getOperator() {
-    result = ">>>"
-  }
+  override string getOperator() { result = ">>>" }
 }
 
 /** An addition expression. */
 class AddExpr extends @addexpr, BinaryExpr {
-  override string getOperator() {
-    result = "+"
-  }
+  override string getOperator() { result = "+" }
 
   override string getStringValue() {
     result = getLeftOperand().getStringValue() + getRightOperand().getStringValue()
@@ -1201,98 +884,54 @@ class AddExpr extends @addexpr, BinaryExpr {
 }
 
 /** A subtraction expression. */
-class SubExpr extends @subexpr, BinaryExpr {
-  override string getOperator() {
-    result = "-"
-  }
-}
+class SubExpr extends @subexpr, BinaryExpr { override string getOperator() { result = "-" } }
 
 /** A multiplication expression. */
-class MulExpr extends @mulexpr, BinaryExpr {
-  override string getOperator() {
-    result = "*"
-  }
-}
+class MulExpr extends @mulexpr, BinaryExpr { override string getOperator() { result = "*" } }
 
 /** A division expression. */
-class DivExpr extends @divexpr, BinaryExpr {
-  override string getOperator() {
-    result = "/"
-  }
-}
+class DivExpr extends @divexpr, BinaryExpr { override string getOperator() { result = "/" } }
 
 /** A modulo expression. */
-class ModExpr extends @modexpr, BinaryExpr {
-  override string getOperator() {
-    result = "%"
-  }
-}
+class ModExpr extends @modexpr, BinaryExpr { override string getOperator() { result = "%" } }
 
 /** An exponentiation expression. */
-class ExpExpr extends @expexpr, BinaryExpr {
-  override string getOperator() {
-    result = "**"
-  }
-}
+class ExpExpr extends @expexpr, BinaryExpr { override string getOperator() { result = "**" } }
 
 /** A bitwise 'or' expression. */
-class BitOrExpr extends @bitorexpr, BinaryExpr {
-  override string getOperator() {
-    result = "|"
-  }
-}
+class BitOrExpr extends @bitorexpr, BinaryExpr { override string getOperator() { result = "|" } }
 
 /** An exclusive 'or' expression. */
-class XOrExpr extends @xorexpr, BinaryExpr {
-  override string getOperator() {
-    result = "^"
-  }
-}
+class XOrExpr extends @xorexpr, BinaryExpr { override string getOperator() { result = "^" } }
 
 /** A bitwise 'and' expression. */
-class BitAndExpr extends @bitandexpr, BinaryExpr {
-  override string getOperator() {
-    result = "&"
-  }
-}
+class BitAndExpr extends @bitandexpr, BinaryExpr { override string getOperator() { result = "&" } }
 
 /** An `in` expression. */
-class InExpr extends @inexpr, BinaryExpr {
-  override string getOperator() {
-    result = "in"
-  }
-}
+class InExpr extends @inexpr, BinaryExpr { override string getOperator() { result = "in" } }
 
 /** An `instanceof` expression. */
 class InstanceofExpr extends @instanceofexpr, BinaryExpr {
-  override string getOperator() {
-    result = "instanceof"
-  }
+  override string getOperator() { result = "instanceof" }
 }
 
 /** A logical 'and' expression. */
 class LogAndExpr extends @logandexpr, BinaryExpr {
-  override string getOperator() {
-    result = "&&"
-  }
+  override string getOperator() { result = "&&" }
 
   override ControlFlowNode getFirstControlFlowNode() { result = this }
 }
 
 /** A logical 'or' expression. */
 class LogOrExpr extends @logorexpr, BinaryExpr {
-  override string getOperator() {
-    result = "||"
-  }
+  override string getOperator() { result = "||" }
 
   override ControlFlowNode getFirstControlFlowNode() { result = this }
 }
 
 /** A nullish coalescing '??' expression. */
 class NullishCoalescingExpr extends @nullishcoalescingexpr, BinaryExpr {
-  override string getOperator() {
-    result = "??"
-  }
+  override string getOperator() { result = "??" }
 
   override ControlFlowNode getFirstControlFlowNode() { result = this }
 }
@@ -1333,90 +972,71 @@ class ShiftExpr extends BinaryExpr {
 /** An assignment expression, either compound or simple. */
 class Assignment extends @assignment, Expr {
   /** Gets the left hand side of this assignment. */
-  Expr getLhs() {
-    result = getChildExpr(0)
-  }
+  Expr getLhs() { result = getChildExpr(0) }
 
   /** Gets the right hand side of this assignment. */
-  Expr getRhs() {
-    result = getChildExpr(1)
-  }
+  Expr getRhs() { result = getChildExpr(1) }
 
   /** Gets the variable or property this assignment writes to, if any. */
-  Expr getTarget() {
-    result = getLhs().stripParens()
-  }
-
-  override ControlFlowNode getFirstControlFlowNode() {
-    result = getLhs().getFirstControlFlowNode()
-  }
+  Expr getTarget() { result = getLhs().stripParens() }
 
+  override ControlFlowNode getFirstControlFlowNode() { result = getLhs().getFirstControlFlowNode() }
 }
 
 /** A simple assignment expression. */
 class AssignExpr extends @assignexpr, Assignment {
-
-  override Expr getUnderlyingValue() {
-    result = getRhs().getUnderlyingValue()
-  }
-
+  override Expr getUnderlyingValue() { result = getRhs().getUnderlyingValue() }
 }
 
 /** A compound assign expression. */
-abstract class CompoundAssignExpr extends Assignment {}
+abstract class CompoundAssignExpr extends Assignment { }
 
 /** A compound add-assign expression. */
-class AssignAddExpr extends @assignaddexpr, CompoundAssignExpr {}
+class AssignAddExpr extends @assignaddexpr, CompoundAssignExpr { }
 
 /** A compound subtract-assign expression. */
-class AssignSubExpr extends @assignsubexpr, CompoundAssignExpr {}
+class AssignSubExpr extends @assignsubexpr, CompoundAssignExpr { }
 
 /** A compound multiply-assign expression. */
-class AssignMulExpr extends @assignmulexpr, CompoundAssignExpr {}
+class AssignMulExpr extends @assignmulexpr, CompoundAssignExpr { }
 
 /** A compound divide-assign expression. */
-class AssignDivExpr extends @assigndivexpr, CompoundAssignExpr {}
+class AssignDivExpr extends @assigndivexpr, CompoundAssignExpr { }
 
 /** A compound modulo-assign expression. */
-class AssignModExpr extends @assignmodexpr, CompoundAssignExpr {}
+class AssignModExpr extends @assignmodexpr, CompoundAssignExpr { }
 
 /** A compound exponentiate-assign expression. */
-class AssignExpExpr extends @assignexpexpr, CompoundAssignExpr {}
+class AssignExpExpr extends @assignexpexpr, CompoundAssignExpr { }
 
 /** A compound left-shift-assign expression. */
-class AssignLShiftExpr extends @assignlshiftexpr, CompoundAssignExpr {}
+class AssignLShiftExpr extends @assignlshiftexpr, CompoundAssignExpr { }
 
 /** A compound right-shift-assign expression. */
-class AssignRShiftExpr extends @assignrshiftexpr, CompoundAssignExpr {}
+class AssignRShiftExpr extends @assignrshiftexpr, CompoundAssignExpr { }
 
 /** A compound unsigned-right-shift-assign expression. */
-class AssignURShiftExpr extends @assignurshiftexpr, CompoundAssignExpr {}
+class AssignURShiftExpr extends @assignurshiftexpr, CompoundAssignExpr { }
 
 /** A compound bitwise-'or'-assign expression. */
-class AssignOrExpr extends @assignorexpr, CompoundAssignExpr {}
+class AssignOrExpr extends @assignorexpr, CompoundAssignExpr { }
 
 /** A compound exclusive-'or'-assign expression. */
-class AssignXOrExpr extends @assignxorexpr, CompoundAssignExpr {}
+class AssignXOrExpr extends @assignxorexpr, CompoundAssignExpr { }
 
 /** A compound bitwise-'and'-assign expression. */
-class AssignAndExpr extends @assignandexpr, CompoundAssignExpr {}
+class AssignAndExpr extends @assignandexpr, CompoundAssignExpr { }
 
 /** An update expression, that is, an increment or decrement expression. */
 class UpdateExpr extends @updateexpr, Expr {
   /** Gets the operand of this update. */
-  Expr getOperand() {
-    result = getChildExpr(0)
-  }
+  Expr getOperand() { result = getChildExpr(0) }
 
   /** Holds if this is a prefix increment or prefix decrement expression. */
-  predicate isPrefix() {
-    none()
-  }
+  predicate isPrefix() { none() }
 
   /** Gets the operator of this update expression. */
-  string getOperator() {
-    none()
-  }
+  string getOperator() { none() }
 
   override ControlFlowNode getFirstControlFlowNode() {
     result = getOperand().getFirstControlFlowNode()
@@ -1425,58 +1045,41 @@ class UpdateExpr extends @updateexpr, Expr {
 
 /** A prefix increment expression. */
 class PreIncExpr extends @preincexpr, UpdateExpr {
-  override predicate isPrefix() {
-    any()
-  }
+  override predicate isPrefix() { any() }
 
-  override string getOperator() {
-    result = "++"
-  }
+  override string getOperator() { result = "++" }
 }
 
 /** A postfix increment expression. */
 class PostIncExpr extends @postincexpr, UpdateExpr {
-  override string getOperator() {
-    result = "++"
-  }
+  override string getOperator() { result = "++" }
 }
 
 /** A prefix decrement expression. */
 class PreDecExpr extends @predecexpr, UpdateExpr {
-  override predicate isPrefix() {
-    any()
-  }
+  override predicate isPrefix() { any() }
 
-  override string getOperator() {
-    result = "--"
-  }
+  override string getOperator() { result = "--" }
 }
 
 /** A postfix decrement expression. */
 class PostDecExpr extends @postdecexpr, UpdateExpr {
-  override string getOperator() {
-    result = "--"
-  }
+  override string getOperator() { result = "--" }
 }
 
 /** A `yield` expression. */
 class YieldExpr extends @yieldexpr, Expr {
   /** Gets the operand of this `yield` expression. */
-  Expr getOperand() {
-    result = getChildExpr(0)
-  }
+  Expr getOperand() { result = getChildExpr(0) }
 
   /** Holds if this is a `yield*` expression. */
-  predicate isDelegating() {
-    isDelegating(this)
-  }
+  predicate isDelegating() { isDelegating(this) }
 
-  override predicate isImpure() {
-    any()
-  }
+  override predicate isImpure() { any() }
 
   override ControlFlowNode getFirstControlFlowNode() {
-    result = getOperand().getFirstControlFlowNode() or
+    result = getOperand().getFirstControlFlowNode()
+    or
     not exists(getOperand()) and result = this
   }
 }
@@ -1488,46 +1091,36 @@ class YieldExpr extends @yieldexpr, Expr {
 class ComprehensionExpr extends @comprehensionexpr, Expr {
   /** Gets the `n`th comprehension block in this comprehension. */
   ComprehensionBlock getBlock(int n) {
-    exists (int idx |
+    exists(int idx |
       result = getChildExpr(idx) and
       idx > 0 and
-      n = idx-1
+      n = idx - 1
     )
   }
 
   /** Gets a comprehension block in this comprehension. */
-  ComprehensionBlock getABlock() {
-    result = getBlock(_)
-  }
+  ComprehensionBlock getABlock() { result = getBlock(_) }
 
   /** Gets the number of comprehension blocks in this comprehension. */
-  int getNumBlock() {
-    result = count(getABlock())
-  }
+  int getNumBlock() { result = count(getABlock()) }
 
   /** Gets the `n`th filter expression in this comprehension. */
   Expr getFilter(int n) {
-    exists (int idx |
+    exists(int idx |
       result = getChildExpr(idx) and
       idx < 0 and
-      n = -idx-1
+      n = -idx - 1
     )
   }
 
   /** Gets a filter expression in this comprehension. */
-  Expr getAFilter() {
-    result = getFilter(_)
-  }
+  Expr getAFilter() { result = getFilter(_) }
 
   /** Gets the number of filter expressions in this comprehension. */
-  int getNumFilter() {
-    result = count(getAFilter())
-  }
+  int getNumFilter() { result = count(getAFilter()) }
 
   /** Gets the body expression of this comprehension. */
-  Expr getBody() {
-    result = getChildExpr(0)
-  }
+  Expr getBody() { result = getChildExpr(0) }
 
   override predicate isImpure() {
     getABlock().isImpure() or
@@ -1537,31 +1130,23 @@ class ComprehensionExpr extends @comprehensionexpr, Expr {
 
   /** Holds if this is a legacy postfix comprehension expression. */
   predicate isPostfix() {
-    exists (Token tk | tk = getFirstToken().getNextToken() |
-      not tk.getValue().regexpMatch("if|for")
-    )
+    exists(Token tk | tk = getFirstToken().getNextToken() | not tk.getValue().regexpMatch("if|for"))
   }
 }
 
 /** An array comprehension expression. */
-class ArrayComprehensionExpr extends @arraycomprehensionexpr, ComprehensionExpr {
-}
+class ArrayComprehensionExpr extends @arraycomprehensionexpr, ComprehensionExpr { }
 
 /** A generator expression. */
-class GeneratorExpr extends @generatorexpr, ComprehensionExpr {
-}
+class GeneratorExpr extends @generatorexpr, ComprehensionExpr { }
 
 /** A comprehension block. */
 class ComprehensionBlock extends @comprehensionblock, Expr {
   /** Gets the iterating variable or pattern of this comprehension block. */
-  BindingPattern getIterator() {
-    result = getChildExpr(0)
-  }
+  BindingPattern getIterator() { result = getChildExpr(0) }
 
   /** Gets the domain over which this comprehension block iterates. */
-  Expr getDomain() {
-    result = getChildExpr(1)
-  }
+  Expr getDomain() { result = getChildExpr(1) }
 
   override predicate isImpure() {
     getIterator().isImpure() or
@@ -1570,12 +1155,10 @@ class ComprehensionBlock extends @comprehensionblock, Expr {
 }
 
 /** A `for`-`in` comprehension block. */
-class ForInComprehensionBlock extends @forincomprehensionblock, ComprehensionBlock {
-}
+class ForInComprehensionBlock extends @forincomprehensionblock, ComprehensionBlock { }
 
 /** A `for`-`of` comprehension block. */
-class ForOfComprehensionBlock extends @forofcomprehensionblock, ComprehensionBlock {
-}
+class ForOfComprehensionBlock extends @forofcomprehensionblock, ComprehensionBlock { }
 
 /** A binary arithmetic expression using `+`, `-`, `/`, `%` or `**`. */
 class ArithmeticExpr extends BinaryExpr {
@@ -1636,17 +1219,18 @@ class RelationalComparison extends Comparison {
    * a `<` or `<=` comparison, and the right operand for `>=` or `>`.
    */
   Expr getLesserOperand() {
-    (this instanceof LTExpr or this instanceof LEExpr) and result = getLeftOperand() or
-    (this instanceof GTExpr or this instanceof GEExpr) and result = getRightOperand()
+    (this instanceof LTExpr or this instanceof LEExpr) and
+    result = getLeftOperand()
+    or
+    (this instanceof GTExpr or this instanceof GEExpr) and
+    result = getRightOperand()
   }
 
   /**
    * Gets the greater operand of this comparison, that is, the right operand for
    * a `<` or `<=` comparison, and the left operand for `>=` or `>`.
    */
-  Expr getGreaterOperand() {
-    result = getAnOperand() and result != getLesserOperand()
-  }
+  Expr getGreaterOperand() { result = getAnOperand() and result != getLesserOperand() }
 
   /**
    * Holds if this is a comparison with `<=` or `>=`.
@@ -1667,23 +1251,16 @@ class DecExpr extends UpdateExpr {
   DecExpr() { this instanceof PreDecExpr or this instanceof PostDecExpr }
 }
 
-
 /** An old-style `let` expression of the form `let(vardecls) expr`. */
 class LegacyLetExpr extends Expr, @legacy_letexpr {
   /** Gets the `i`th declarator in this `let` expression. */
-  VariableDeclarator getDecl(int i) {
-    result = getChildExpr(i) and i >= 0
-  }
+  VariableDeclarator getDecl(int i) { result = getChildExpr(i) and i >= 0 }
 
   /** Gets a declarator in this declaration expression. */
-  VariableDeclarator getADecl() {
-    result = getDecl(_)
-  }
+  VariableDeclarator getADecl() { result = getDecl(_) }
 
   /** Gets the expression this `let` expression scopes over. */
-  Expr getBody() {
-    result = getChildExpr(-1)
-  }
+  Expr getBody() { result = getChildExpr(-1) }
 }
 
 /** An immediately invoked function expression (IIFE). */
@@ -1700,9 +1277,10 @@ class ImmediatelyInvokedFunctionExpr extends Function {
 
   ImmediatelyInvokedFunctionExpr() {
     // direct call
-    this = invk.getCallee().getUnderlyingValue() and kind = "direct" or
+    this = invk.getCallee().getUnderlyingValue() and kind = "direct"
+    or
     // reflective call
-    exists (MethodCallExpr mce | mce = invk |
+    exists(MethodCallExpr mce | mce = invk |
       this = mce.getReceiver().getUnderlyingValue() and
       kind = mce.getMethodName() and
       (kind = "call" or kind = "apply")
@@ -1710,31 +1288,23 @@ class ImmediatelyInvokedFunctionExpr extends Function {
   }
 
   /** Gets the invocation of this IIFE. */
-  InvokeExpr getInvocation() {
-    result = invk
-  }
+  InvokeExpr getInvocation() { result = invk }
 
   /**
    * Gets a string describing the way this IIFE is invoked
    * (one of `"direct"`, `"call"` or `"apply"`).
    */
-  string getInvocationKind() {
-    result = kind
-  }
+  string getInvocationKind() { result = kind }
 
   /**
    * Gets the `i`th argument of this IIFE.
    */
-  Expr getArgument(int i) {
-    result = invk.getArgument(i)
-  }
+  Expr getArgument(int i) { result = invk.getArgument(i) }
 
   /**
    * Holds if the `i`th argument of this IIFE is a spread element.
    */
-  predicate isSpreadArgument(int i) {
-    invk.isSpreadArgument(i)
-  }
+  predicate isSpreadArgument(int i) { invk.isSpreadArgument(i) }
 
   /**
    * Gets the offset of argument positions relative to parameter
@@ -1743,7 +1313,8 @@ class ImmediatelyInvokedFunctionExpr extends Function {
    * IIFEs using `Function.prototype.apply` the offset is not defined.
    */
   int getArgumentOffset() {
-    kind = "direct" and result = 0 or
+    kind = "direct" and result = 0
+    or
     kind = "call" and result = 1
   }
 
@@ -1756,10 +1327,12 @@ class ImmediatelyInvokedFunctionExpr extends Function {
    * parameter.
    */
   predicate argumentPassing(Parameter p, Expr arg) {
-    exists (int parmIdx, int argIdx |
-      p = getParameter(parmIdx) and not p.isRestParameter() and
-      argIdx = parmIdx + getArgumentOffset() and arg = getArgument(argIdx) and
-      not isSpreadArgument([0..argIdx])
+    exists(int parmIdx, int argIdx |
+      p = getParameter(parmIdx) and
+      not p.isRestParameter() and
+      argIdx = parmIdx + getArgumentOffset() and
+      arg = getArgument(argIdx) and
+      not isSpreadArgument([0 .. argIdx])
     )
   }
 }
@@ -1767,13 +1340,9 @@ class ImmediatelyInvokedFunctionExpr extends Function {
 /** An `await` expression. */
 class AwaitExpr extends @awaitexpr, Expr {
   /** Gets the operand of this `await` expression. */
-  Expr getOperand() {
-    result = getChildExpr(0)
-  }
+  Expr getOperand() { result = getChildExpr(0) }
 
-  override predicate isImpure() {
-    any()
-  }
+  override predicate isImpure() { any() }
 
   override ControlFlowNode getFirstControlFlowNode() {
     result = getOperand().getFirstControlFlowNode()
@@ -1787,11 +1356,7 @@ class AwaitExpr extends @awaitexpr, Expr {
  * to the generator by the `next` method that most recently resumed execution
  * of the generator.
  */
-class FunctionSentExpr extends @functionsentexpr, Expr {
-  override predicate isImpure() {
-    none()
-  }
-}
+class FunctionSentExpr extends @functionsentexpr, Expr { override predicate isImpure() { none() } }
 
 /**
  * A decorator applied to a class, property or member definition.
@@ -1806,9 +1371,7 @@ class Decorator extends @decorator, Expr {
    * For example, in the class declaration `@A class C { }`,
    * the element decorator `@A` is applied to is `C`.
    */
-  Decoratable getElement() {
-    this = result.getADecorator()
-  }
+  Decoratable getElement() { this = result.getADecorator() }
 
   /**
    * Gets the expression of this decorator.
@@ -1816,9 +1379,7 @@ class Decorator extends @decorator, Expr {
    * For example, the decorator `@A` has expression `A`,
    * and `@testable(true)` has expression `testable(true)`.
    */
-  Expr getExpression() {
-    result = getChildExpr(0)
-  }
+  Expr getExpression() { result = getChildExpr(0) }
 
   override ControlFlowNode getFirstControlFlowNode() {
     result = getExpression().getFirstControlFlowNode()
@@ -1852,9 +1413,7 @@ class Decoratable extends ASTNode {
   /**
    * Gets a decorator applied to this element, if any.
    */
-  Decorator getADecorator() {
-    result = this.getDecorator(_)
-  }
+  Decorator getADecorator() { result = this.getDecorator(_) }
 }
 
 /**
@@ -1866,17 +1425,14 @@ class FunctionBindExpr extends @bindexpr, Expr {
    * Gets the object of this function bind expression; undefined for
    * expressions of the form `::b.f`.
    */
-  Expr getObject() {
-    result = getChildExpr(0)
-  }
+  Expr getObject() { result = getChildExpr(0) }
 
   /** Gets the callee of this function bind expression. */
-  Expr getCallee() {
-    result = getChildExpr(1)
-  }
+  Expr getCallee() { result = getChildExpr(1) }
 
   override ControlFlowNode getFirstControlFlowNode() {
-    result = getObject().getFirstControlFlowNode() or
+    result = getObject().getFirstControlFlowNode()
+    or
     not exists(getObject()) and result = getCallee().getFirstControlFlowNode()
   }
 }
@@ -1886,28 +1442,21 @@ class FunctionBindExpr extends @bindexpr, Expr {
  */
 class DynamicImportExpr extends @dynamicimport, Expr, Import {
   /** Gets the expression specifying the path of the imported module. */
-  Expr getSource() {
-    result = getChildExpr(0)
-  }
+  Expr getSource() { result = getChildExpr(0) }
 
   override ControlFlowNode getFirstControlFlowNode() {
     result = getSource().getFirstControlFlowNode()
   }
 
-  override PathExpr getImportedPath() {
-    result = getSource()
-  }
+  override PathExpr getImportedPath() { result = getSource() }
 
-  override Module getEnclosingModule() {
-    result = getTopLevel()
-  }
+  override Module getEnclosingModule() { result = getTopLevel() }
 }
 
-
 /** A literal path expression appearing in a dynamic import. */
 private class LiteralDynamicImportPath extends PathExprInModule, ConstantString {
   LiteralDynamicImportPath() {
-    exists (DynamicImportExpr di | this.getParentExpr*() = di.getSource())
+    exists(DynamicImportExpr di | this.getParentExpr*() = di.getSource())
   }
 
   override string getValue() { result = this.(ConstantString).getStringValue() }
diff --git a/javascript/ql/src/semmle/javascript/Extend.qll b/javascript/ql/src/semmle/javascript/Extend.qll
index af297095b3e0..c1aa8a32699c 100644
--- a/javascript/ql/src/semmle/javascript/Extend.qll
+++ b/javascript/ql/src/semmle/javascript/Extend.qll
@@ -1,6 +1,7 @@
 /**
  * Provides classes for reasoning about `extend`-like functions.
  */
+
 import javascript
 
 /**
@@ -39,11 +40,12 @@ abstract class ExtendCall extends DataFlow::CallNode {
  */
 private class ExtendCallWithFlag extends ExtendCall {
   ExtendCallWithFlag() {
-    exists (string name | this = DataFlow::moduleImport(name).getACall() |
+    exists(string name | this = DataFlow::moduleImport(name).getACall() |
       name = "extend" or
       name = "extend2" or
       name = "just-extend" or
-      name = "node.extend")
+      name = "node.extend"
+    )
     or
     this = jquery().getAPropertyRead("extend").getACall()
   }
@@ -51,31 +53,22 @@ private class ExtendCallWithFlag extends ExtendCall {
   /**
    * Holds if the first argument appears to be a boolean flag.
    */
-  predicate hasFlag() {
-    getArgument(0).mayHaveBooleanValue(_)
-  }
+  predicate hasFlag() { getArgument(0).mayHaveBooleanValue(_) }
 
   /**
    * Gets the `n`th argument after the optional boolean flag.
    */
   DataFlow::Node getTranslatedArgument(int n) {
-    if hasFlag() then
-      result = getArgument(n + 1)
-    else
-      result = getArgument(n)
+    if hasFlag() then result = getArgument(n + 1) else result = getArgument(n)
   }
 
   override DataFlow::Node getASourceOperand() {
-    exists (int n | n >= 1 | result = getTranslatedArgument(n))
+    exists(int n | n >= 1 | result = getTranslatedArgument(n))
   }
 
-  override DataFlow::Node getDestinationOperand() {
-    result = getTranslatedArgument(0)
-  }
+  override DataFlow::Node getDestinationOperand() { result = getTranslatedArgument(0) }
 
-  override predicate isDeep() {
-    getArgument(0).mayHaveBooleanValue(true)
-  }
+  override predicate isDeep() { getArgument(0).mayHaveBooleanValue(true) }
 }
 
 /**
@@ -83,7 +76,7 @@ private class ExtendCallWithFlag extends ExtendCall {
  */
 private class ExtendCallDeep extends ExtendCall {
   ExtendCallDeep() {
-    exists (DataFlow::SourceNode callee | this = callee.getACall() |
+    exists(DataFlow::SourceNode callee | this = callee.getACall() |
       callee = DataFlow::moduleMember("deep", "extend") or
       callee = DataFlow::moduleImport("deep-assign") or
       callee = DataFlow::moduleImport("deep-extend") or
@@ -100,16 +93,13 @@ private class ExtendCallDeep extends ExtendCall {
       callee = DataFlow::moduleMember("smart-extend", "deep") or
       callee = LodashUnderscore::member("merge") or
       callee = LodashUnderscore::member("mergeWith") or
-      callee = LodashUnderscore::member("defaultsDeep"))
+      callee = LodashUnderscore::member("defaultsDeep")
+    )
   }
 
-  override DataFlow::Node getASourceOperand() {
-    exists (int n | n >= 1 | result = getArgument(n))
-  }
+  override DataFlow::Node getASourceOperand() { exists(int n | n >= 1 | result = getArgument(n)) }
 
-  override DataFlow::Node getDestinationOperand() {
-    result = getArgument(0)
-  }
+  override DataFlow::Node getDestinationOperand() { result = getArgument(0) }
 
   override predicate isDeep() { any() }
 }
@@ -119,7 +109,7 @@ private class ExtendCallDeep extends ExtendCall {
  */
 private class ExtendCallShallow extends ExtendCall {
   ExtendCallShallow() {
-    exists (DataFlow::SourceNode callee | this = callee.getACall() |
+    exists(DataFlow::SourceNode callee | this = callee.getACall() |
       callee = DataFlow::globalVarRef("Object").getAPropertyRead("assign") or
       callee = DataFlow::moduleImport("defaults") or
       callee = DataFlow::moduleImport("extend-shallow") or
@@ -132,16 +122,13 @@ private class ExtendCallShallow extends ExtendCall {
       callee = DataFlow::moduleImport("util-extend") or
       callee = DataFlow::moduleImport("utils-merge") or
       callee = DataFlow::moduleImport("xtend/mutable") or
-      callee = LodashUnderscore::member("extend"))
+      callee = LodashUnderscore::member("extend")
+    )
   }
 
-  override DataFlow::Node getASourceOperand() {
-    exists (int n | n >= 1 | result = getArgument(n))
-  }
+  override DataFlow::Node getASourceOperand() { exists(int n | n >= 1 | result = getArgument(n)) }
 
-  override DataFlow::Node getDestinationOperand() {
-    result = getArgument(0)
-  }
+  override DataFlow::Node getDestinationOperand() { result = getArgument(0) }
 
   override predicate isDeep() { none() }
 }
@@ -151,20 +138,16 @@ private class ExtendCallShallow extends ExtendCall {
  */
 private class FunctionalExtendCallShallow extends ExtendCall {
   FunctionalExtendCallShallow() {
-    exists (DataFlow::SourceNode callee | this = callee.getACall() |
+    exists(DataFlow::SourceNode callee | this = callee.getACall() |
       callee = DataFlow::moduleImport("xtend") or
       callee = DataFlow::moduleImport("xtend/immutable") or
       callee = DataFlow::moduleMember("ramda", "merge")
     )
   }
 
-  override DataFlow::Node getASourceOperand() {
-    result = getAnArgument()
-  }
+  override DataFlow::Node getASourceOperand() { result = getAnArgument() }
 
-  override DataFlow::Node getDestinationOperand() {
-    none()
-  }
+  override DataFlow::Node getDestinationOperand() { none() }
 
   override predicate isDeep() { none() }
 }
@@ -176,9 +159,7 @@ private class FunctionalExtendCallShallow extends ExtendCall {
 private class ExtendCallTaintStep extends TaintTracking::AdditionalTaintStep {
   ExtendCall extend;
 
-  ExtendCallTaintStep() {
-    this = extend
-  }
+  ExtendCallTaintStep() { this = extend }
 
   override predicate step(DataFlow::Node pred, DataFlow::Node succ) {
     pred = extend.getASourceOperand() and succ = extend.getDestinationOperand().getALocalSource()
diff --git a/javascript/ql/src/semmle/javascript/Externs.qll b/javascript/ql/src/semmle/javascript/Externs.qll
index 361586160724..2573f7897395 100644
--- a/javascript/ql/src/semmle/javascript/Externs.qll
+++ b/javascript/ql/src/semmle/javascript/Externs.qll
@@ -61,13 +61,9 @@ class ExternalTypedef extends ExternalDecl, VariableDeclarator {
     hasTypedefAnnotation(getDeclStmt())
   }
 
-  override string getName() {
-    result = getBindingPattern().(Identifier).getName()
-  }
+  override string getName() { result = getBindingPattern().(Identifier).getName() }
 
-  override string getQualifiedName() {
-    result = getName()
-  }
+  override string getQualifiedName() { result = getName() }
 }
 
 /** A variable or function declaration in an externs file. */
@@ -82,39 +78,27 @@ abstract class ExternalVarDecl extends ExternalDecl {
   /**
    * Gets a JSDoc tag associated with this declaration.
    */
-  JSDocTag getATag() {
-    result = this.(Documentable).getDocumentation().getATag()
-  }
+  JSDocTag getATag() { result = this.(Documentable).getDocumentation().getATag() }
 
   /**
    * Gets the `@type` tag associated with this declaration, if any.
    */
-  ExternalTypeTag getTypeTag() {
-    result = getATag()
-  }
+  ExternalTypeTag getTypeTag() { result = getATag() }
 }
 
 /** A global declaration of a function or variable in an externs file. */
 abstract class ExternalGlobalDecl extends ExternalVarDecl {
-  override string getQualifiedName() {
-    result = getName()
-  }
+  override string getQualifiedName() { result = getName() }
 }
 
 /** A global function declaration in an externs file. */
 class ExternalGlobalFunctionDecl extends ExternalGlobalDecl, FunctionDeclStmt {
-  ExternalGlobalFunctionDecl() {
-    inExternsFile()
-  }
+  ExternalGlobalFunctionDecl() { inExternsFile() }
 
   /** Gets the name of this declaration. */
-  override string getName() {
-    result = FunctionDeclStmt.super.getName()
-  }
+  override string getName() { result = FunctionDeclStmt.super.getName() }
 
-  override ASTNode getInit() {
-    result = this
-  }
+  override ASTNode getInit() { result = this }
 }
 
 /** A global variable declaration in an externs file. */
@@ -126,22 +110,20 @@ class ExternalGlobalVarDecl extends ExternalGlobalDecl, VariableDeclarator {
     not hasTypedefAnnotation(getDeclStmt())
   }
 
-  override string getName() {
-    result = getBindingPattern().(Identifier).getName()
-  }
+  override string getName() { result = getBindingPattern().(Identifier).getName() }
 
   /** Gets the initializer associated with this declaration, if any. */
-  override Expr getInit() {
-    result = VariableDeclarator.super.getInit()
-  }
+  override Expr getInit() { result = VariableDeclarator.super.getInit() }
 }
 
 /** A member variable declaration in an externs file. */
 class ExternalMemberDecl extends ExternalVarDecl, ExprStmt {
   ExternalMemberDecl() {
     getParent() instanceof Externs and
-    (getExpr() instanceof PropAccess or
-     getExpr().(AssignExpr).getLhs() instanceof PropAccess)
+    (
+      getExpr() instanceof PropAccess or
+      getExpr().(AssignExpr).getLhs() instanceof PropAccess
+    )
   }
 
   /**
@@ -152,38 +134,26 @@ class ExternalMemberDecl extends ExternalVarDecl, ExprStmt {
     result = getExpr().(AssignExpr).getLhs()
   }
 
-  override Expr getInit() {
-    result = getExpr().(AssignExpr).getRhs()
-  }
+  override Expr getInit() { result = getExpr().(AssignExpr).getRhs() }
 
-  override string getQualifiedName() {
-    result = getBaseName() + "." + getName()
-  }
+  override string getQualifiedName() { result = getBaseName() + "." + getName() }
 
   /**
    * Holds if this member belongs to type `base` and has name `name`.
    */
-  predicate hasQualifiedName(string base, string name) {
-    base = getBaseName() and name = getName()
-  }
+  predicate hasQualifiedName(string base, string name) { base = getBaseName() and name = getName() }
 
-  override string getName() {
-    result = getProperty().getPropertyName()
-  }
+  override string getName() { result = getProperty().getPropertyName() }
 
   /**
    * Gets the name of the base type to which the member declared by this declaration belongs.
    */
-  string getBaseName() {
-    none()
-  }
+  string getBaseName() { none() }
 
   /**
    * Gets the base type to which the member declared by this declaration belongs.
    */
-  ExternalType getDeclaringType() {
-    result.getQualifiedName() = getBaseName()
-  }
+  ExternalType getDeclaringType() { result.getQualifiedName() = getBaseName() }
 }
 
 /**
@@ -193,13 +163,9 @@ class ExternalMemberDecl extends ExternalVarDecl, ExprStmt {
  * with initializers of the form `A.f = {};`.
  */
 class ExternalStaticMemberDecl extends ExternalMemberDecl {
-  ExternalStaticMemberDecl() {
-    getProperty().getBase() instanceof Identifier
-  }
+  ExternalStaticMemberDecl() { getProperty().getBase() instanceof Identifier }
 
-  override string getBaseName() {
-    result = getProperty().getBase().(Identifier).getName()
-  }
+  override string getBaseName() { result = getProperty().getBase().(Identifier).getName() }
 }
 
 /**
@@ -210,8 +176,7 @@ class ExternalStaticMemberDecl extends ExternalMemberDecl {
  */
 class ExternalInstanceMemberDecl extends ExternalMemberDecl {
   ExternalInstanceMemberDecl() {
-    exists (PropAccess outer, PropAccess inner |
-      outer = getProperty() and inner = outer.getBase() |
+    exists(PropAccess outer, PropAccess inner | outer = getProperty() and inner = outer.getBase() |
       inner.getBase() instanceof Identifier and
       inner.getPropertyName() = "prototype"
     )
@@ -226,14 +191,10 @@ class ExternalInstanceMemberDecl extends ExternalMemberDecl {
  * A function or object defined in an externs file.
  */
 class ExternalEntity extends ASTNode {
-  ExternalEntity() {
-    exists (ExternalVarDecl d | d.getInit() = this)
-  }
+  ExternalEntity() { exists(ExternalVarDecl d | d.getInit() = this) }
 
   /** Gets the variable declaration to which this entity belongs. */
-  ExternalVarDecl getDecl() {
-    result.getInit() = this
-  }
+  ExternalVarDecl getDecl() { result.getInit() = this }
 }
 
 /**
@@ -244,8 +205,8 @@ class ExternalFunction extends ExternalEntity, Function {
    * Holds if the last parameter of this external function has a rest parameter type annotation.
    */
   predicate isVarArgs() {
-    exists (SimpleParameter lastParm, JSDocParamTag pt |
-      lastParm = this.getParameter(this.getNumParameter()-1) and
+    exists(SimpleParameter lastParm, JSDocParamTag pt |
+      lastParm = this.getParameter(this.getNumParameter() - 1) and
       pt = getDecl().getATag() and
       pt.getName() = lastParm.getName() and
       pt.getType() instanceof JSDocRestParameterTypeExpr
@@ -256,9 +217,7 @@ class ExternalFunction extends ExternalEntity, Function {
 /**
  * A `@constructor` tag.
  */
-class ConstructorTag extends JSDocTag {
-  ConstructorTag() { getTitle() = "constructor" }
-}
+class ConstructorTag extends JSDocTag { ConstructorTag() { getTitle() = "constructor" } }
 
 /** A JSDoc tag that refers to a named type. */
 abstract private class NamedTypeReferent extends JSDocTag {
@@ -280,9 +239,7 @@ abstract private class NamedTypeReferent extends JSDocTag {
    * type `Array`, which is also the source declaration of `!Array=`. Primitive types,
    * union types, and other complex kinds of types do not have a source declaration.
    */
-  ExternalType getTypeDeclaration() {
-    result = sourceDecl(getType())
-  }
+  ExternalType getTypeDeclaration() { result = sourceDecl(getType()) }
 }
 
 /**
@@ -299,23 +256,17 @@ private ExternalType sourceDecl(JSDocTypeExpr tp) {
 /**
  * An `@implements` tag.
  */
-class ImplementsTag extends NamedTypeReferent {
-  ImplementsTag() { getTitle() = "implements" }
-}
+class ImplementsTag extends NamedTypeReferent { ImplementsTag() { getTitle() = "implements" } }
 
 /**
  * An `@extends` tag.
  */
-class ExtendsTag extends NamedTypeReferent {
-  ExtendsTag() { getTitle() = "extends" }
-}
+class ExtendsTag extends NamedTypeReferent { ExtendsTag() { getTitle() = "extends" } }
 
 /**
  * A `@type` tag.
  */
-class ExternalTypeTag extends NamedTypeReferent {
-  ExternalTypeTag() { getTitle() = "type" }
-}
+class ExternalTypeTag extends NamedTypeReferent { ExternalTypeTag() { getTitle() = "type" } }
 
 /**
  * A constructor or interface function defined in an externs file.
@@ -332,57 +283,37 @@ abstract class ExternalType extends ExternalGlobalFunctionDecl {
   }
 
   /** Gets a supertype of this type. */
-  ExternalType getASupertype() {
-    result = getAnExtendedType() or result = getAnImplementedType()
-  }
+  ExternalType getASupertype() { result = getAnExtendedType() or result = getAnImplementedType() }
 
   /** Gets a declaration of a member of this type. */
-  ExternalMemberDecl getAMember() {
-    result.getDeclaringType() = this
-  }
+  ExternalMemberDecl getAMember() { result.getDeclaringType() = this }
 }
 
 /**
  * A constructor function defined in an externs file.
  */
 class ExternalConstructor extends ExternalType {
-  ExternalConstructor() {
-    getDocumentation().getATag() instanceof ConstructorTag
-  }
+  ExternalConstructor() { getDocumentation().getATag() instanceof ConstructorTag }
 }
 
 /**
  * An interface function defined in an externs file.
  */
 class ExternalInterface extends ExternalType {
-  ExternalInterface() {
-    getDocumentation().getATag().getTitle() = "interface"
-  }
+  ExternalInterface() { getDocumentation().getATag().getTitle() = "interface" }
 }
 
 /**
  * Externs definition for the Function object.
  */
-class FunctionExternal extends ExternalConstructor {
-  FunctionExternal() {
-    getName() = "Function"
-  }
-}
+class FunctionExternal extends ExternalConstructor { FunctionExternal() { getName() = "Function" } }
 
 /**
  * Externs definition for the Object object.
  */
-class ObjectExternal extends ExternalConstructor {
-  ObjectExternal() {
-    getName() = "Object"
-  }
-}
+class ObjectExternal extends ExternalConstructor { ObjectExternal() { getName() = "Object" } }
 
 /**
  * Externs definition for the Array object.
  */
-class ArrayExternal extends ExternalConstructor {
-  ArrayExternal() {
-    getName() = "Array"
-  }
-}
+class ArrayExternal extends ExternalConstructor { ArrayExternal() { getName() = "Array" } }
diff --git a/javascript/ql/src/semmle/javascript/Files.qll b/javascript/ql/src/semmle/javascript/Files.qll
index 61c6cfb84d7b..26189e5ad060 100644
--- a/javascript/ql/src/semmle/javascript/Files.qll
+++ b/javascript/ql/src/semmle/javascript/Files.qll
@@ -47,8 +47,9 @@ abstract class Container extends @container {
    * if the root folder is not a reflexive, transitive parent of this container.
    */
   string getRelativePath() {
-    exists (string absPath, string pref |
-      absPath = getAbsolutePath() and sourceLocationPrefix(pref) |
+    exists(string absPath, string pref |
+      absPath = getAbsolutePath() and sourceLocationPrefix(pref)
+    |
       absPath = pref and result = ""
       or
       absPath = pref.regexpReplaceAll("/$", "") + "/" + result and
@@ -100,9 +101,7 @@ abstract class Container extends @container {
    * <tr><td>"/tmp/x.tar.gz"</td><td>"gz"</td></tr>
    * </table>
    */
-  string getExtension() {
-    result = getAbsolutePath().regexpCapture(".*/([^/]*?)(\\.([^.]*))?", 3)
-  }
+  string getExtension() { result = getAbsolutePath().regexpCapture(".*/([^/]*?)(\\.([^.]*))?", 3) }
 
   /**
    * Gets the stem of this container, that is, the prefix of its base name up to
@@ -121,24 +120,16 @@ abstract class Container extends @container {
    * <tr><td>"/tmp/x.tar.gz"</td><td>"x.tar"</td></tr>
    * </table>
    */
-  string getStem() {
-    result = getAbsolutePath().regexpCapture(".*/([^/]*?)(?:\\.([^.]*))?", 1)
-  }
+  string getStem() { result = getAbsolutePath().regexpCapture(".*/([^/]*?)(?:\\.([^.]*))?", 1) }
 
   /** Gets the parent container of this file or folder, if any. */
-  Container getParentContainer() {
-    containerparent(result, this)
-  }
+  Container getParentContainer() { containerparent(result, this) }
 
   /** Gets a file or sub-folder in this container. */
-  Container getAChildContainer() {
-    this = result.getParentContainer()
-  }
+  Container getAChildContainer() { this = result.getParentContainer() }
 
   /** Gets a file in this container. */
-  File getAFile() {
-    result = getAChildContainer()
-  }
+  File getAFile() { result = getAChildContainer() }
 
   /** Gets the file in this container that has the given `baseName`, if any. */
   File getFile(string baseName) {
@@ -147,9 +138,7 @@ abstract class Container extends @container {
   }
 
   /** Gets a sub-folder in this container. */
-  Folder getAFolder() {
-    result = getAChildContainer()
-  }
+  Folder getAFolder() { result = getAChildContainer() }
 
   /** Gets the sub-folder in this container that has the given `baseName`, if any. */
   Folder getFolder(string baseName) {
@@ -162,16 +151,12 @@ abstract class Container extends @container {
    *
    * This is the absolute path of the container.
    */
-  string toString() {
-    result = getAbsolutePath()
-  }
+  string toString() { result = getAbsolutePath() }
 }
 
 /** A folder. */
 class Folder extends Container, @folder {
-  override string getAbsolutePath() {
-    folders(this, result, _)
-  }
+  override string getAbsolutePath() { folders(this, result, _) }
 
   /** Gets the file or subfolder in this folder that has the given `name`, if any. */
   Container getChildContainer(string name) {
@@ -198,58 +183,44 @@ class Folder extends Container, @folder {
    * HTML files will not be found by this method.
    */
   File getJavaScriptFile(string stem) {
-    result = min(int p, string ext | p = getFileExtensionPriority(ext) | getFile(stem, ext) order by p)
+    result = min(int p, string ext |
+        p = getFileExtensionPriority(ext)
+      |
+        getFile(stem, ext)
+        order by
+          p
+      )
   }
 
   /** Gets a subfolder contained in this folder. */
-  Folder getASubFolder() {
-    result = getAChildContainer()
-  }
+  Folder getASubFolder() { result = getAChildContainer() }
 
   /** Gets the URL of this folder. */
-  override string getURL() {
-    result = "folder://" + getAbsolutePath()
-  }
+  override string getURL() { result = "folder://" + getAbsolutePath() }
 }
 
 /** A file. */
 class File extends Container, @file, Locatable {
-  override Location getLocation() {
-    hasLocation(this, result)
-  }
+  override Location getLocation() { hasLocation(this, result) }
 
-  override string getAbsolutePath() {
-    files(this, result, _, _, _)
-  }
+  override string getAbsolutePath() { files(this, result, _, _, _) }
 
   /** Gets the number of lines in this file. */
-  int getNumberOfLines() {
-    numlines(this, result, _, _)
-  }
+  int getNumberOfLines() { numlines(this, result, _, _) }
 
   /** Gets the number of lines containing code in this file. */
-  int getNumberOfLinesOfCode() {
-    numlines(this, _, result, _)
-  }
+  int getNumberOfLinesOfCode() { numlines(this, _, result, _) }
 
   /** Gets the number of lines containing comments in this file. */
-  int getNumberOfLinesOfComments() {
-    numlines(this, _, _, result)
-  }
+  int getNumberOfLinesOfComments() { numlines(this, _, _, result) }
 
   /** Gets a toplevel piece of JavaScript code in this file. */
-  TopLevel getATopLevel() {
-    result.getFile() = this
-  }
+  TopLevel getATopLevel() { result.getFile() = this }
 
-  override string toString() {
-    result = Container.super.toString()
-  }
+  override string toString() { result = Container.super.toString() }
 
   /** Gets the URL of this file. */
-  override string getURL() {
-    result = "file://" + this.getAbsolutePath() + ":0:0:0:0"
-  }
+  override string getURL() { result = "file://" + this.getAbsolutePath() + ":0:0:0:0" }
 
   /**
    * Holds if line number `lineno` of this file is indented to depth `d`
@@ -263,16 +234,12 @@ class File extends Container, @file, Locatable {
    * or for lines starting with a string of different whitespace characters
    * (for instance, a mix of tabs and spaces).
    */
-  predicate hasIndentation(int lineno, string c, int d) {
-    indentation(this, lineno, c, d)
-  }
+  predicate hasIndentation(int lineno, string c, int d) { indentation(this, lineno, c, d) }
 
   /**
    * Gets the type of this file.
    */
-  FileType getFileType() {
-    filetype(this, result)
-  }
+  FileType getFileType() { filetype(this, result) }
 }
 
 /**
@@ -290,35 +257,25 @@ class FileType extends string {
   /**
    * Holds if this is the JavaScript file type.
    */
-  predicate isJavaScript() {
-    this = "javascript"
-  }
+  predicate isJavaScript() { this = "javascript" }
 
   /**
    * Holds if this is the HTML file type.
    */
-  predicate isHtml() {
-    this = "html"
-  }
+  predicate isHtml() { this = "html" }
 
   /**
    * Holds if this is the TypeScript file type.
    */
-  predicate isTypeScript() {
-    this = "typescript"
-  }
+  predicate isTypeScript() { this = "typescript" }
 
   /**
    * Holds if this is the JSON file type.
    */
-  predicate isJson() {
-    this = "json"
-  }
+  predicate isJson() { this = "json" }
 
   /**
    * Holds if this is the YAML file type.
    */
-  predicate isYaml() {
-    this = "yaml"
-  }
-}
\ No newline at end of file
+  predicate isYaml() { this = "yaml" }
+}
diff --git a/javascript/ql/src/semmle/javascript/Functions.qll b/javascript/ql/src/semmle/javascript/Functions.qll
index 049b66128a49..80840033d590 100644
--- a/javascript/ql/src/semmle/javascript/Functions.qll
+++ b/javascript/ql/src/semmle/javascript/Functions.qll
@@ -3,16 +3,13 @@
 import javascript
 
 /** A function as defined either by a function declaration or a function expression. */
-class Function extends @function, Parameterized, TypeParameterized, StmtContainer, Documentable, AST::ValueNode {
+class Function extends @function, Parameterized, TypeParameterized, StmtContainer, Documentable,
+  AST::ValueNode {
   /** Gets the `i`th parameter of this function. */
-  Parameter getParameter(int i) {
-    result = getChildExpr(i)
-  }
+  Parameter getParameter(int i) { result = getChildExpr(i) }
 
   /** Gets a parameter of this function. */
-  override Parameter getAParameter() {
-    exists (int idx | result = getParameter(idx))
-  }
+  override Parameter getAParameter() { exists(int idx | result = getParameter(idx)) }
 
   /** Gets the parameter named `name` of this function, if any. */
   SimpleParameter getParameterByName(string name) {
@@ -23,7 +20,9 @@ class Function extends @function, Parameterized, TypeParameterized, StmtContaine
   /** Gets the `n`th type parameter declared on this function. */
   override TypeParameter getTypeParameter(int i) {
     // Type parameters are at indices -7, -10, -13, ...
-    exists (int astIndex | typeexprs(result, _, this, astIndex, _) | astIndex <= -7 and astIndex % 4 = -3 and i = -(astIndex + 7) / 4)
+    exists(int astIndex | typeexprs(result, _, this, astIndex, _) |
+      astIndex <= -7 and astIndex % 4 = -3 and i = -(astIndex + 7) / 4
+    )
   }
 
   /**
@@ -39,81 +38,51 @@ class Function extends @function, Parameterized, TypeParameterized, StmtContaine
    *
    * `this` parameter types are specific to TypeScript.
    */
-  TypeExpr getThisTypeAnnotation() {
-    result = getChildTypeExpr(-4)
-  }
+  TypeExpr getThisTypeAnnotation() { result = getChildTypeExpr(-4) }
 
   /** Gets the identifier specifying the name of this function, if any. */
-  VarDecl getId() {
-   result = getChildExpr(-1)
-  }
+  VarDecl getId() { result = getChildExpr(-1) }
 
   /** Gets the name of this function, if any. */
-  string getName() {
-    result = getId().getName()
-  }
+  string getName() { result = getId().getName() }
 
   /** Gets the variable holding this function. */
-  Variable getVariable() {
-    result = getId().getVariable()
-  }
+  Variable getVariable() { result = getId().getVariable() }
 
   /** Gets the `arguments` variable of this function, if any. */
-  ArgumentsVariable getArgumentsVariable() {
-    result.getFunction() = this
-  }
+  ArgumentsVariable getArgumentsVariable() { result.getFunction() = this }
 
   /** Holds if the body of this function refers to the function's `arguments` variable. */
-  predicate usesArgumentsObject() {
-    exists (getArgumentsVariable().getAnAccess())
-  }
+  predicate usesArgumentsObject() { exists(getArgumentsVariable().getAnAccess()) }
 
   /**
    * Holds if this function declares a parameter or local variable named `arguments`.
    */
-  predicate declaresArguments() {
-    exists(getScope().getVariable("arguments").getADeclaration())
-  }
+  predicate declaresArguments() { exists(getScope().getVariable("arguments").getADeclaration()) }
 
   /** Gets the statement enclosing this function, if any. */
-  Stmt getEnclosingStmt() {
-    none()
-  }
+  Stmt getEnclosingStmt() { none() }
 
   /** Gets the body of this function. */
-  override ExprOrStmt getBody() {
-    result = getChild(-2)
-  }
+  override ExprOrStmt getBody() { result = getChild(-2) }
 
   /** Gets the `i`th statement in the body of this function. */
-  Stmt getBodyStmt(int i) {
-    result = getBody().(BlockStmt).getStmt(i)
-  }
+  Stmt getBodyStmt(int i) { result = getBody().(BlockStmt).getStmt(i) }
 
   /** Gets a statement in the body of this function. */
-  Stmt getABodyStmt() {
-    result = getBodyStmt(_)
-  }
+  Stmt getABodyStmt() { result = getBodyStmt(_) }
 
   /** Gets the number of statements in the body of this function. */
-  int getNumBodyStmt() {
-    result = count(getABodyStmt())
-  }
+  int getNumBodyStmt() { result = count(getABodyStmt()) }
 
   /** Gets the return type annotation on this function, if any. */
-  TypeExpr getReturnTypeAnnotation() {
-    typeexprs(result, _, this, -3, _)
-  }
+  TypeExpr getReturnTypeAnnotation() { typeexprs(result, _, this, -3, _) }
 
   /** Holds if this function is a generator function. */
-  predicate isGenerator() {
-    isGenerator(this)
-  }
+  predicate isGenerator() { isGenerator(this) }
 
   /** Holds if the last parameter of this function is a rest parameter. */
-  predicate hasRestParameter() {
-    hasRestParameter(this)
-  }
+  predicate hasRestParameter() { hasRestParameter(this) }
 
   /**
    * Gets the last token of this function's parameter list, not including
@@ -121,8 +90,9 @@ class Function extends @function, Parameterized, TypeParameterized, StmtContaine
    */
   private Token lastTokenOfParameterList() {
     // if there are any parameters, it's the last token of the last parameter
-    exists (Parameter lastParam | lastParam = getParameter(getNumParameter()-1) |
-      result = lastParam.getDefault().getLastToken() or
+    exists(Parameter lastParam | lastParam = getParameter(getNumParameter() - 1) |
+      result = lastParam.getDefault().getLastToken()
+      or
       not exists(lastParam.getDefault()) and result = lastParam.getLastToken()
     )
     or
@@ -131,7 +101,8 @@ class Function extends @function, Parameterized, TypeParameterized, StmtContaine
     not exists(getAParameter()) and
     (
       // if the function has a name, the opening parenthesis comes right after it
-      result = getId().getLastToken().getNextToken() or
+      result = getId().getLastToken().getNextToken()
+      or
       // otherwise this must be an arrow function with no parameters, so the opening
       // parenthesis is the very first token of the function
       not exists(getId()) and result = getFirstToken()
@@ -139,58 +110,45 @@ class Function extends @function, Parameterized, TypeParameterized, StmtContaine
   }
 
   /** Holds if the parameter list of this function has a trailing comma. */
-  predicate hasTrailingComma() {
-    lastTokenOfParameterList().getNextToken().getValue() = ","
-  }
+  predicate hasTrailingComma() { lastTokenOfParameterList().getNextToken().getValue() = "," }
 
   /** Holds if this function is an asynchronous function. */
-  predicate isAsync() {
-    isAsync(this)
-  }
+  predicate isAsync() { isAsync(this) }
 
   /** Gets the enclosing function or toplevel of this function. */
-  override StmtContainer getEnclosingContainer() {
-    result = getEnclosingStmt().getContainer()
-  }
+  override StmtContainer getEnclosingContainer() { result = getEnclosingStmt().getContainer() }
 
   /** Gets the number of lines in this function. */
-  int getNumberOfLines() {
-    numlines(this, result, _, _)
-  }
+  int getNumberOfLines() { numlines(this, result, _, _) }
 
   /** Gets the number of lines containing code in this function. */
-  int getNumberOfLinesOfCode() {
-    numlines(this, _, result, _)
-  }
+  int getNumberOfLinesOfCode() { numlines(this, _, result, _) }
 
   /** Gets the number of lines containing comments in this function. */
-  int getNumberOfLinesOfComments() {
-    numlines(this, _, _, result)
-  }
+  int getNumberOfLinesOfComments() { numlines(this, _, _, result) }
 
   /** Gets the cyclomatic complexity of this function. */
   int getCyclomaticComplexity() {
     result = 2 +
-      sum (Expr nd | nd.getContainer() = this and nd.isBranch() |
-                     strictcount(nd.getASuccessor()) - 1)
+        sum(Expr nd |
+          nd.getContainer() = this and nd.isBranch()
+        |
+          strictcount(nd.getASuccessor()) - 1
+        )
   }
 
   override predicate isStrict() {
     // check for explicit strict mode directive
-    exists (StrictModeDecl smd | this = smd.getContainer())
-    or
+    exists(StrictModeDecl smd | this = smd.getContainer()) or
     // check for enclosing strict function
-    StmtContainer.super.isStrict()
-    or
+    StmtContainer.super.isStrict() or
     // all parts of a class definition are strict code
     this.getParent*() = any(ClassDefinition cd).getSuperClass() or
     this = any(MethodDeclaration md).getBody()
   }
 
   /** Gets a return statement in the body of this function, if any. */
-  ReturnStmt getAReturnStmt() {
-    result.getContainer() = this
-  }
+  ReturnStmt getAReturnStmt() { result.getContainer() = this }
 
   /** Gets an expression that could be returned by this function, if any. */
   Expr getAReturnedExpr() {
@@ -202,9 +160,7 @@ class Function extends @function, Parameterized, TypeParameterized, StmtContaine
    * Gets the function whose `this` binding a `this` expression in this function refers to,
    * which is the nearest enclosing non-arrow function.
    */
-  Function getThisBinder() {
-    result = this
-  }
+  Function getThisBinder() { result = this }
 
   /**
    * Gets the function or top-level whose `this` binding a `this` expression in this function refers to,
@@ -225,9 +181,9 @@ class Function extends @function, Parameterized, TypeParameterized, StmtContaine
    * parameter, no parameter default values, and no destructuring parameters.
    */
   predicate hasMappedArgumentsVariable() {
-    exists (getArgumentsVariable()) and
+    exists(getArgumentsVariable()) and
     not isStrict() and
-    forall (Parameter p | p = getAParameter() |
+    forall(Parameter p | p = getAParameter() |
       p instanceof SimpleParameter and not exists(p.getDefault())
     ) and
     not hasRestParameter()
@@ -242,20 +198,24 @@ class Function extends @function, Parameterized, TypeParameterized, StmtContaine
    * can be inferred, the result is "anonymous function".
    */
   override string describe() {
-    if exists(inferNameFromVarDef()) then
-      result = inferNameFromVarDef()
-    else if exists(inferNameFromProp()) then
-      result = inferNameFromProp()
-    else if exists(inferNameFromMemberDef()) then
-      result = inferNameFromMemberDef()
-    else if exists(inferNameFromCallSig()) then
-      result = inferNameFromCallSig()
-    else if exists(inferNameFromIndexSig()) then
-      result = inferNameFromIndexSig()
-    else if exists(inferNameFromFunctionType()) then
-      result = inferNameFromFunctionType()
+    if exists(inferNameFromVarDef())
+    then result = inferNameFromVarDef()
     else
-      result = "anonymous function"
+      if exists(inferNameFromProp())
+      then result = inferNameFromProp()
+      else
+        if exists(inferNameFromMemberDef())
+        then result = inferNameFromMemberDef()
+        else
+          if exists(inferNameFromCallSig())
+          then result = inferNameFromCallSig()
+          else
+            if exists(inferNameFromIndexSig())
+            then result = inferNameFromIndexSig()
+            else
+              if exists(inferNameFromFunctionType())
+              then result = inferNameFromFunctionType()
+              else result = "anonymous function"
   }
 
   /**
@@ -264,11 +224,12 @@ class Function extends @function, Parameterized, TypeParameterized, StmtContaine
    */
   private string inferNameFromVarDef() {
     // in ambiguous cases like `var f = function g() {}`, prefer `g` to `f`
-    if exists(getName()) then
-      result = "function " + getName()
-    else exists (VarDef vd | this = vd.getSource() |
-      result = "function " + vd.getTarget().(VarRef).getName()
-    )
+    if exists(getName())
+    then result = "function " + getName()
+    else
+      exists(VarDef vd | this = vd.getSource() |
+        result = "function " + vd.getTarget().(VarRef).getName()
+      )
   }
 
   /**
@@ -276,9 +237,11 @@ class Function extends @function, Parameterized, TypeParameterized, StmtContaine
    * it is assigned to, if any.
    */
   private string inferNameFromProp() {
-    exists (Property p, string n | this = p.getInit() and n = p.getName() |
-      p instanceof PropertyGetter and result = "getter for property " + n or
-      p instanceof PropertySetter and result = "setter for property " + n or
+    exists(Property p, string n | this = p.getInit() and n = p.getName() |
+      p instanceof PropertyGetter and result = "getter for property " + n
+      or
+      p instanceof PropertySetter and result = "setter for property " + n
+      or
       p instanceof ValueProperty and result = "method " + n
     )
   }
@@ -288,20 +251,21 @@ class Function extends @function, Parameterized, TypeParameterized, StmtContaine
    * member it is assigned to, if any.
    */
   private string inferNameFromMemberDef() {
-    exists (ClassOrInterface c, string n, MemberDeclaration m, string classpp |
-      m = c.getMember(n) and this = m.getInit() and classpp = c.describe() |
-      if m instanceof ConstructorDeclaration then
-        if m.(ConstructorDeclaration).isSynthetic() then
-          result = "default constructor of " + classpp
-        else
-          result = "constructor of " + classpp
+    exists(ClassOrInterface c, string n, MemberDeclaration m, string classpp |
+      m = c.getMember(n) and this = m.getInit() and classpp = c.describe()
+    |
+      if m instanceof ConstructorDeclaration
+      then
+        if m.(ConstructorDeclaration).isSynthetic()
+        then result = "default constructor of " + classpp
+        else result = "constructor of " + classpp
       else
-        if m instanceof GetterMethodDeclaration then
-          result = "getter method for property " + n + " of " + classpp
-        else if m instanceof SetterMethodDeclaration then
-          result = "setter method for property " + n + " of " + classpp
+        if m instanceof GetterMethodDeclaration
+        then result = "getter method for property " + n + " of " + classpp
         else
-          result = "method " + n + " of " + classpp
+          if m instanceof SetterMethodDeclaration
+          then result = "setter method for property " + n + " of " + classpp
+          else result = "method " + n + " of " + classpp
     )
   }
 
@@ -309,8 +273,9 @@ class Function extends @function, Parameterized, TypeParameterized, StmtContaine
    * Gets a description of this function if it is part of a call signature.
    */
   private string inferNameFromCallSig() {
-    exists (InterfaceDefinition c, CallSignature sig |
-      sig = c.getACallSignature() and sig.getBody() = this and
+    exists(InterfaceDefinition c, CallSignature sig |
+      sig = c.getACallSignature() and
+      sig.getBody() = this and
       if sig instanceof FunctionCallSignature
       then result = "call signature of " + c.describe()
       else result = "construct signature of " + c.describe()
@@ -321,7 +286,7 @@ class Function extends @function, Parameterized, TypeParameterized, StmtContaine
    * Gets a description of this function if it is part of a call signature.
    */
   private string inferNameFromIndexSig() {
-    exists (InterfaceDefinition c | c.getAnIndexSignature().getBody() = this |
+    exists(InterfaceDefinition c | c.getAnIndexSignature().getBody() = this |
       result = "index signature of " + c.describe()
     )
   }
@@ -330,8 +295,7 @@ class Function extends @function, Parameterized, TypeParameterized, StmtContaine
    * Gets a description of this function if it is part of a function type.
    */
   private string inferNameFromFunctionType() {
-    exists (FunctionTypeExpr type | type.getFunction() = this |
-      result = "anonymous function type")
+    exists(FunctionTypeExpr type | type.getFunction() = this | result = "anonymous function type")
   }
 
   /**
@@ -341,27 +305,22 @@ class Function extends @function, Parameterized, TypeParameterized, StmtContaine
    *
    * A JavaScript function always has a body.
    */
-  predicate hasBody() {
-    exists (getBody())
-  }
+  predicate hasBody() { exists(getBody()) }
 
   /**
    * Holds if this function is part of an abstract class member.
    */
-  predicate isAbstract() {
-    exists (MethodDeclaration md | this = md.getBody() | md.isAbstract())
-  }
+  predicate isAbstract() { exists(MethodDeclaration md | this = md.getBody() | md.isAbstract()) }
 
-  override predicate isAmbient() {
-    getParent().isAmbient() or not hasBody()
-  }
+  override predicate isAmbient() { getParent().isAmbient() or not hasBody() }
 
   /**
    * Holds if this function cannot be invoked using `new` because it
    * is of the given `kind`.
    */
   predicate isNonConstructible(string kind) {
-    this instanceof Method and not this instanceof Constructor and
+    this instanceof Method and
+    not this instanceof Constructor and
     kind = "a method"
     or
     this instanceof ArrowFunctionExpr and
@@ -379,9 +338,7 @@ class Function extends @function, Parameterized, TypeParameterized, StmtContaine
    *
    * This predicate is only populated for files extracted with full TypeScript extraction.
    */
-  CanonicalFunctionName getCanonicalName() {
-    ast_node_symbol(this, result)
-  }
+  CanonicalFunctionName getCanonicalName() { ast_node_symbol(this, result) }
 }
 
 /**
@@ -389,9 +346,9 @@ class Function extends @function, Parameterized, TypeParameterized, StmtContaine
  */
 class Method extends FunctionExpr {
   Method() {
-    exists (MethodDeclaration md | this = md.getBody())
+    exists(MethodDeclaration md | this = md.getBody())
     or
-    exists (ValueProperty p | p.isMethod() | this = p.getInit())
+    exists(ValueProperty p | p.isMethod() | this = p.getInit())
   }
 }
 
@@ -399,7 +356,5 @@ class Method extends FunctionExpr {
  * A constructor defined in a class.
  */
 class Constructor extends FunctionExpr {
-  Constructor() {
-    exists (ConstructorDeclaration cd | this = cd.getBody())
-  }
+  Constructor() { exists(ConstructorDeclaration cd | this = cd.getBody()) }
 }
diff --git a/javascript/ql/src/semmle/javascript/GeneratedCode.qll b/javascript/ql/src/semmle/javascript/GeneratedCode.qll
index 2b1af5446b51..7dc6d803f888 100644
--- a/javascript/ql/src/semmle/javascript/GeneratedCode.qll
+++ b/javascript/ql/src/semmle/javascript/GeneratedCode.qll
@@ -11,39 +11,35 @@ import semmle.javascript.SourceMaps
 /**
  * A comment that marks generated code.
  */
-abstract class GeneratedCodeMarkerComment extends Comment {
-}
+abstract class GeneratedCodeMarkerComment extends Comment { }
 
 /**
  * A source mapping comment, viewed as a marker comment indicating generated code.
  */
 private class SourceMappingCommentMarkerComment extends GeneratedCodeMarkerComment {
-  SourceMappingCommentMarkerComment() {
-    this instanceof SourceMappingComment
-  }
+  SourceMappingCommentMarkerComment() { this instanceof SourceMappingComment }
 }
 
 /**
  * A marker comment left by a known code generator.
  */
 class CodeGeneratorMarkerComment extends GeneratedCodeMarkerComment {
-  CodeGeneratorMarkerComment() {
-    codeGeneratorMarkerComment(this, _)
-  }
+  CodeGeneratorMarkerComment() { codeGeneratorMarkerComment(this, _) }
 
   /** Gets the name of the code generator that left this marker comment. */
-  string getGeneratorName() {
-    codeGeneratorMarkerComment(this, result)
-  }
+  string getGeneratorName() { codeGeneratorMarkerComment(this, result) }
 }
 
 /**
  * Holds if `c` is a comment left by code generator `tool`.
  */
 private predicate codeGeneratorMarkerComment(Comment c, string tool) {
-  exists (string toolPattern |
+  exists(string toolPattern |
     toolPattern = "js_of_ocaml|CoffeeScript|LiveScript|dart2js|ANTLR|PEG\\.js|Opal|JSX|jison(?:-lex)?|(?:Microsoft \\(R\\) AutoRest Code Generator)|purs" and
-    tool = c.getText().regexpCapture("(?s)[\\s*]*(?:parser |Code )?[gG]eneratedy? (?:from .*)?by (" + toolPattern + ")\\b.*", 1)
+    tool = c
+          .getText()
+          .regexpCapture("(?s)[\\s*]*(?:parser |Code )?[gG]eneratedy? (?:from .*)?by (" +
+              toolPattern + ")\\b.*", 1)
   )
 }
 
@@ -52,13 +48,14 @@ private predicate codeGeneratorMarkerComment(Comment c, string tool) {
  */
 private class GenericGeneratedCodeMarkerComment extends GeneratedCodeMarkerComment {
   GenericGeneratedCodeMarkerComment() {
-    exists (string line | line = getLine(_) |
-      exists (string entity, string was, string automatically |
+    exists(string line | line = getLine(_) |
+      exists(string entity, string was, string automatically |
         entity = "code|file|class|interface|art[ei]fact|module|script" and
         was = "was|is|has been" and
         automatically = "automatically |mechanically |auto[- ]?" and
-        line.regexpMatch("(?i).*\\b(This|The following) (" + entity + ") (" +
-                         was + ") (" + automatically + ")?gener(e?)ated\\b.*")
+        line
+            .regexpMatch("(?i).*\\b(This|The following) (" + entity + ") (" + was + ") (" +
+                automatically + ")?gener(e?)ated\\b.*")
       )
     )
   }
@@ -69,7 +66,7 @@ private class GenericGeneratedCodeMarkerComment extends GeneratedCodeMarkerComme
  */
 private class DontModifyMarkerComment extends GeneratedCodeMarkerComment {
   DontModifyMarkerComment() {
-    exists (string line | line = getLine(_) |
+    exists(string line | line = getLine(_) |
       line.regexpMatch("(?i).*\\bGenerated by\\b.*\\bDo not edit\\b.*") or
       line.regexpMatch("(?i).*\\bAny modifications to this file will be lost\\b.*")
     )
@@ -79,7 +76,7 @@ private class DontModifyMarkerComment extends GeneratedCodeMarkerComment {
 /** A script that looks like it was generated by dart2js. */
 private class DartGeneratedTopLevel extends TopLevel {
   DartGeneratedTopLevel() {
-    exists (VarAccess deferredInit | deferredInit.getTopLevel() = this |
+    exists(VarAccess deferredInit | deferredInit.getTopLevel() = this |
       deferredInit.getName() = "$dart_deferred_initializers$" or
       deferredInit.getName() = "$dart_deferred_initializers"
     )
@@ -92,10 +89,11 @@ private class DartGeneratedTopLevel extends TopLevel {
  */
 private predicate hasManyInvocations(TopLevel tl) {
   // heuristic: more than 100 arguments per line means it's probably generated
-  exists (int nl, int na |
-    nl = tl.getNumberOfLines() and nl > 0 and
+  exists(int nl, int na |
+    nl = tl.getNumberOfLines() and
+    nl > 0 and
     na = sum(InvokeExpr invk | tl = invk.getTopLevel() | invk.getNumArgument()) and
-    (float)na / nl > 100
+    na.(float) / nl > 100
   )
 }
 
@@ -106,7 +104,7 @@ private predicate isData(File f) {
   // heuristic: `f` has more than 1000 primitive literal expressions ...
   count(SyntacticConstants::PrimitiveLiteralConstant e | e.getFile() = f) > 1000 and
   // ... but no expressions with side effects ...
-  not exists (Expr e |
+  not exists(Expr e |
     e.getFile() = f and
     e.isImpure() and
     // ... except for variable initializers
@@ -133,7 +131,7 @@ predicate isGenerated(TopLevel tl) {
   isBundle(tl) or
   tl instanceof GWTGeneratedTopLevel or
   tl instanceof DartGeneratedTopLevel or
-  exists (GeneratedCodeMarkerComment gcmc | tl = gcmc.getTopLevel()) or
+  exists(GeneratedCodeMarkerComment gcmc | tl = gcmc.getTopLevel()) or
   hasManyInvocations(tl) or
   isData(tl.getFile()) or
   isGeneratedHtml(tl.getFile())
diff --git a/javascript/ql/src/semmle/javascript/HTML.qll b/javascript/ql/src/semmle/javascript/HTML.qll
index cb173955d3d1..8370946399b4 100644
--- a/javascript/ql/src/semmle/javascript/HTML.qll
+++ b/javascript/ql/src/semmle/javascript/HTML.qll
@@ -6,91 +6,62 @@ module HTML {
   /**
    * An HTML file.
    */
-  class HtmlFile extends File {
-    HtmlFile() {
-      getFileType().isHtml()
-    }
-  }
+  class HtmlFile extends File { HtmlFile() { getFileType().isHtml() } }
 
   /**
    * An HTML element like `<a href="semmle.com">Semmle</a>`.
    */
   class Element extends Locatable, @xmlelement {
-    Element() {
-      exists (HtmlFile f | xmlElements(this, _, _, _, f))
-    }
+    Element() { exists(HtmlFile f | xmlElements(this, _, _, _, f)) }
 
-    override Location getLocation() {
-      xmllocations(this, result)
-    }
+    override Location getLocation() { xmllocations(this, result) }
 
     /**
      * Gets the name of this HTML element.
      *
      * For example, the name of `<br>` is `br`.
      */
-    string getName() {
-      xmlElements(this, result, _, _, _)
-    }
+    string getName() { xmlElements(this, result, _, _, _) }
 
     /**
      * Gets the parent element of this element, if any.
      */
-    Element getParent() {
-      xmlElements(this, _, result, _, _)
-    }
+    Element getParent() { xmlElements(this, _, result, _, _) }
 
     /**
      * Holds if this is a toplevel element, that is, if it does not have a parent element.
      */
-    predicate isTopLevel() {
-      not exists(getParent())
-    }
+    predicate isTopLevel() { not exists(getParent()) }
 
     /**
      * Gets the root HTML document element in which this element is contained.
      */
-    DocumentElement getDocument() {
-      result = getRoot()
-    }
+    DocumentElement getDocument() { result = getRoot() }
 
     /**
      * Gets the root element in which this element is contained.
      */
-    Element getRoot() {
-      if isTopLevel() then
-        result = this
-      else
-        result = getParent().getRoot()
-    }
+    Element getRoot() { if isTopLevel() then result = this else result = getParent().getRoot() }
 
     /**
      * Gets the `i`th child element (0-based) of this element.
      */
-    Element getChild(int i) {
-      xmlElements(result, _, this, i, _)
-    }
+    Element getChild(int i) { xmlElements(result, _, this, i, _) }
 
     /**
      * Gets a child element of this element.
      */
-    Element getChild() {
-      result = getChild(_)
-    }
+    Element getChild() { result = getChild(_) }
 
     /**
      * Gets the `i`th attribute (0-based) of this element.
      */
-    Attribute getAttribute(int i) {
-      xmlAttrs(result, this, _, _, i, _)
-    }
+    Attribute getAttribute(int i) { xmlAttrs(result, this, _, _, i, _) }
 
     /**
      * Gets an attribute of this element.
      */
-    Attribute getAnAttribute() {
-      result = getAttribute(_)
-    }
+    Attribute getAnAttribute() { result = getAttribute(_) }
 
     /**
      * Gets an attribute of this element that has the given name.
@@ -100,9 +71,7 @@ module HTML {
       result.getName() = name
     }
 
-    override string toString() {
-      result = "<" + getName() + ">...</>"
-    }
+    override string toString() { result = "<" + getName() + ">...</>" }
   }
 
   /**
@@ -112,35 +81,25 @@ module HTML {
    * has two attributes: `href ="semmle.com"` and `target=_blank`.
    */
   class Attribute extends Locatable, @xmlattribute {
-    Attribute() {
-      exists (HtmlFile f | xmlAttrs(this, _, _, _, _, f))
-    }
+    Attribute() { exists(HtmlFile f | xmlAttrs(this, _, _, _, _, f)) }
 
-    override Location getLocation() {
-      xmllocations(this, result)
-    }
+    override Location getLocation() { xmllocations(this, result) }
 
     /**
      * Gets the element to which this attribute belongs.
      */
-    Element getElement() {
-      xmlAttrs(this, result, _, _, _, _)
-    }
+    Element getElement() { xmlAttrs(this, result, _, _, _, _) }
 
     /**
      * Gets the root element in which the element to which this attribute
      * belongs is contained.
      */
-    Element getRoot() {
-      result = getElement().getRoot()
-    }
+    Element getRoot() { result = getElement().getRoot() }
 
     /**
      * Gets the name of this attribute.
      */
-    string getName() {
-      xmlAttrs(this, _, result, _, _, _)
-    }
+    string getName() { xmlAttrs(this, _, result, _, _, _) }
 
     /**
      * Gets the value of this attribute.
@@ -148,31 +107,21 @@ module HTML {
      * For attributes without an explicitly specified value, the
      * result is the empty string.
      */
-    string getValue() {
-      xmlAttrs(this, _, _, result, _ ,_)
-    }
+    string getValue() { xmlAttrs(this, _, _, result, _, _) }
 
-    override string toString() {
-      result = getName() + "=" + getValue()
-    }
+    override string toString() { result = getName() + "=" + getValue() }
   }
 
   /**
    * An HTML `<html>` element.
    */
-  class DocumentElement extends Element {
-    DocumentElement() {
-      getName() = "html"
-    }
-  }
+  class DocumentElement extends Element { DocumentElement() { getName() = "html" } }
 
   /**
    * An HTML `<script>` element.
    */
   class ScriptElement extends Element {
-    ScriptElement() {
-      getName() = "script"
-    }
+    ScriptElement() { getName() = "script" }
 
     /**
      * Gets the absolute file system path the value of the `src` attribute
@@ -183,7 +132,7 @@ module HTML {
      * to the enclosing HTML file. Base URLs are not taken into account.
      */
     string resolveSourcePath() {
-      exists (string path | path = getSourcePath() |
+      exists(string path | path = getSourcePath() |
         result = path.regexpCapture("file://(/.*)", 1)
         or
         not path.regexpMatch("(\\w+:)?//.*") and
@@ -194,27 +143,22 @@ module HTML {
     /**
      * Gets the value of the `src` attribute.
      */
-    string getSourcePath() {
-      result = getAttributeByName("src").getValue()
-    }
+    string getSourcePath() { result = getAttributeByName("src").getValue() }
 
     /**
      * Gets the folder relative to which the `src` attribute is resolved.
      */
     Folder getSearchRoot() {
-      if getSourcePath().matches("/%") then
-        result.getBaseName() = ""
-      else
-        result = getFile().getParentContainer()
+      if getSourcePath().matches("/%")
+      then result.getBaseName() = ""
+      else result = getFile().getParentContainer()
     }
 
     /**
      * Gets the script referred to by the `src` attribute,
      * if it can be determined.
      */
-    Script resolveSource() {
-      result.getFile().getAbsolutePath() = resolveSourcePath()
-    }
+    Script resolveSource() { result.getFile().getAbsolutePath() = resolveSourcePath() }
   }
 
   /**
@@ -222,7 +166,7 @@ module HTML {
    * such that the script is resolved relative to `root`.
    */
   private predicate scriptSrc(string src, Folder root) {
-    exists (ScriptElement script |
+    exists(ScriptElement script |
       src = script.getSourcePath() and
       root = script.getSearchRoot()
     )
@@ -232,13 +176,9 @@ module HTML {
    * A path string arising from the `src` attribute of a `script` tag.
    */
   private class ScriptSrcPath extends PathString {
-    ScriptSrcPath() {
-      scriptSrc(this, _)
-    }
+    ScriptSrcPath() { scriptSrc(this, _) }
 
-    override Folder getARootFolder() {
-      scriptSrc(this, result)
-    }
+    override Folder getARootFolder() { scriptSrc(this, result) }
   }
 
   /**
@@ -247,87 +187,67 @@ module HTML {
    * Note that instances of this class are only available if extraction is done with `--html all` or `--experimental`.
    */
   class TextNode extends Locatable, @xmlcharacters {
-    TextNode() {
-      exists (HtmlFile f | xmlChars(this, _, _, _, _, f))
-    }
+    TextNode() { exists(HtmlFile f | xmlChars(this, _, _, _, _, f)) }
 
-    override string toString() {
-      result = getText()
-    }
+    override string toString() { result = getText() }
 
     /**
      * Gets the content of this text node.
      *
      * Note that entity expansion has been performed already.
      */
-    string getText() {
-      xmlChars(this, result, _, _, _, _)
-    }
+    string getText() { xmlChars(this, result, _, _, _, _) }
 
     /**
      * Gets the parent this text.
      */
-    Element getParent() {
-      xmlChars(this, _, result, _, _, _)
-    }
+    Element getParent() { xmlChars(this, _, result, _, _, _) }
 
     /**
      * Gets the child index number of this text node.
      */
-    int getIndex() {
-      xmlChars(this, _, _, result, _, _)
-    }
+    int getIndex() { xmlChars(this, _, _, result, _, _) }
 
     /**
      * Holds if this text node is inside a `CDATA` tag.
      */
-    predicate isCData() {
-      xmlChars(this, _, _, _, 1, _)
-    }
-
-    override Location getLocation() {
-      xmllocations(this, result)
-    }
+    predicate isCData() { xmlChars(this, _, _, _, 1, _) }
 
+    override Location getLocation() { xmllocations(this, result) }
   }
 
   /**
    * An HTML comment like <code>&lt;!&hyphen;&hyphen; this &hyphen;&hyphen;&gt;</code>.
    */
   class CommentNode extends Locatable, @xmlcomment {
-    CommentNode() {
-      exists (HtmlFile f | xmlComments(this, _, _, f))
-    }
+    CommentNode() { exists(HtmlFile f | xmlComments(this, _, _, f)) }
 
     /** Gets the element in which this comment occurs. */
-    Element getParent() {
-      xmlComments(this, _, result, _)
-    }
+    Element getParent() { xmlComments(this, _, result, _) }
 
     /** Gets the text of this comment, not including delimiters. */
-    string getText() {
-      result = toString().regexpCapture("(?s)<!--(.*)-->", 1)
-    }
+    string getText() { result = toString().regexpCapture("(?s)<!--(.*)-->", 1) }
 
-    override string toString() {
-      xmlComments(this, result, _, _)
-    }
+    override string toString() { xmlComments(this, result, _, _) }
 
-    override Location getLocation() {
-      xmllocations(this, result)
-    }
+    override Location getLocation() { xmllocations(this, result) }
   }
 }
 
 /** DEPRECATED: Use `HTML::HtmlFile` instead. */
 deprecated class HTMLFile = HTML::HtmlFile;
+
 /** DEPRECATED: Use `HTML::Element` instead. */
 deprecated class HTMLElement = HTML::Element;
+
 /** DEPRECATED: Use `HTML::Attribute` instead. */
 deprecated class HTMLAttribute = HTML::Attribute;
+
 /** DEPRECATED: Use `HTML::DocumentElement` instead. */
 deprecated class HtmlDocumentElement = HTML::DocumentElement;
+
 /** DEPRECATED: Use `HTML::ScriptElement` instead. */
 deprecated class HtmlScriptElement = HTML::ScriptElement;
+
 /** DEPRECATED: Use `HTML::TextNode` instead. */
 deprecated class HtmlText = HTML::TextNode;
diff --git a/javascript/ql/src/semmle/javascript/HtmlSanitizers.qll b/javascript/ql/src/semmle/javascript/HtmlSanitizers.qll
index 9cf646efdf21..4aba42b64c88 100644
--- a/javascript/ql/src/semmle/javascript/HtmlSanitizers.qll
+++ b/javascript/ql/src/semmle/javascript/HtmlSanitizers.qll
@@ -1,6 +1,7 @@
 /**
  * Provides classes for working with HTML sanitizers.
  */
+
 import javascript
 
 /**
@@ -20,29 +21,46 @@ abstract class HtmlSanitizerCall extends DataFlow::CallNode {
  */
 private class DefaultHtmlSanitizerCall extends HtmlSanitizerCall {
   DefaultHtmlSanitizerCall() {
-    exists (DataFlow::SourceNode callee | this = callee.getACall() |
-      callee = DataFlow::moduleMember("ent", "encode") or
-      callee = DataFlow::moduleMember("entities", "encodeHTML") or
-      callee = DataFlow::moduleMember("entities", "encodeXML") or
-      callee = DataFlow::moduleMember("escape-goat", "escape") or
-      callee = DataFlow::moduleMember("he", "encode") or
-      callee = DataFlow::moduleMember("he", "escape") or
-      callee = DataFlow::moduleImport("sanitize-html") or
-      callee = DataFlow::moduleMember("sanitizer", "escape") or
-      callee = DataFlow::moduleMember("sanitizer", "sanitize") or
-      callee = DataFlow::moduleMember("validator", "escape") or
-      callee = DataFlow::moduleImport("xss") or
-      callee = DataFlow::moduleMember("xss-filters", _) or
-      callee = LodashUnderscore::member("escape") or
-      exists (string name | name = "encode" or name = "encodeNonUTF" |
-        callee = DataFlow::moduleMember("html-entities", _).getAnInstantiation().getAPropertyRead(name) or
-        callee = DataFlow::moduleMember("html-entities", _).getAPropertyRead(name))
+    exists(DataFlow::SourceNode callee | this = callee.getACall() |
+      callee = DataFlow::moduleMember("ent", "encode")
+      or
+      callee = DataFlow::moduleMember("entities", "encodeHTML")
+      or
+      callee = DataFlow::moduleMember("entities", "encodeXML")
+      or
+      callee = DataFlow::moduleMember("escape-goat", "escape")
+      or
+      callee = DataFlow::moduleMember("he", "encode")
+      or
+      callee = DataFlow::moduleMember("he", "escape")
+      or
+      callee = DataFlow::moduleImport("sanitize-html")
+      or
+      callee = DataFlow::moduleMember("sanitizer", "escape")
+      or
+      callee = DataFlow::moduleMember("sanitizer", "sanitize")
+      or
+      callee = DataFlow::moduleMember("validator", "escape")
+      or
+      callee = DataFlow::moduleImport("xss")
+      or
+      callee = DataFlow::moduleMember("xss-filters", _)
+      or
+      callee = LodashUnderscore::member("escape")
+      or
+      exists(string name | name = "encode" or name = "encodeNonUTF" |
+        callee = DataFlow::moduleMember("html-entities", _)
+              .getAnInstantiation()
+              .getAPropertyRead(name) or
+        callee = DataFlow::moduleMember("html-entities", _).getAPropertyRead(name)
+      )
     )
     or
     // Match home-made sanitizers by name.
-    exists (string calleeName | calleeName = getCalleeName() |
+    exists(string calleeName | calleeName = getCalleeName() |
       calleeName.regexpMatch("(?i).*html.*") and
-      calleeName.regexpMatch("(?i).*(?<!un)(saniti[sz]|escape|strip).*"))
+      calleeName.regexpMatch("(?i).*(?<!un)(saniti[sz]|escape|strip).*")
+    )
   }
 
   override DataFlow::Node getInput() { result = getArgument(0) }
diff --git a/javascript/ql/src/semmle/javascript/JSDoc.qll b/javascript/ql/src/semmle/javascript/JSDoc.qll
index 5f414da4647c..c5f48b63298b 100644
--- a/javascript/ql/src/semmle/javascript/JSDoc.qll
+++ b/javascript/ql/src/semmle/javascript/JSDoc.qll
@@ -6,28 +6,18 @@ import javascript
  * A JSDoc comment.
  */
 class JSDoc extends @jsdoc, Locatable {
-  override Location getLocation() {
-    hasLocation(this, result)
-  }
+  override Location getLocation() { hasLocation(this, result) }
 
   /** Gets the description text of this JSDoc comment. */
-  string getDescription() {
-    jsdoc(this, result, _)
-  }
+  string getDescription() { jsdoc(this, result, _) }
 
   /** Gets the raw comment this JSDoc comment is an interpretation of. */
-  Comment getComment() {
-    jsdoc(this, _, result)
-  }
+  Comment getComment() { jsdoc(this, _, result) }
 
   /** Gets a JSDoc tag within this JSDoc comment. */
-  JSDocTag getATag() {
-    result.getParent() = this
-  }
+  JSDocTag getATag() { result.getParent() = this }
 
-  override string toString() {
-    result = getComment().toString()
-  }
+  override string toString() { result = getComment().toString() }
 }
 
 /**
@@ -36,9 +26,7 @@ class JSDoc extends @jsdoc, Locatable {
 abstract class Documentable extends ASTNode {
   /** Gets the JSDoc comment for this element, if any. */
   cached
-  JSDoc getDocumentation() {
-    result.getComment().getNextToken() = getFirstToken()
-  }
+  JSDoc getDocumentation() { result.getComment().getNextToken() = getFirstToken() }
 }
 
 /**
@@ -54,72 +42,52 @@ class JSDocTypeExprParent extends @jsdoc_type_expr_parent {
  * A JSDoc tag such as `@param Object options An object literal with options.`
  */
 class JSDocTag extends @jsdoc_tag, JSDocTypeExprParent, Locatable {
-  override Location getLocation() {
-    hasLocation(this, result)
-  }
+  override Location getLocation() { hasLocation(this, result) }
 
   /** Gets the tag title; for instance, the title of a `@param` tag is `"param"`. */
-  string getTitle() {
-    jsdoc_tags (this, result, _, _, _)
-  }
+  string getTitle() { jsdoc_tags(this, result, _, _, _) }
 
   /** Gets the JSDoc comment this tag belongs to. */
-  JSDoc getParent() {
-    jsdoc_tags (this, _, result, _, _)
-  }
+  JSDoc getParent() { jsdoc_tags(this, _, result, _, _) }
 
   /** Gets the index of this tag within its parent comment. */
-  int getIndex() {
-    jsdoc_tags (this, _, _, result, _)
-  }
+  int getIndex() { jsdoc_tags(this, _, _, result, _) }
 
-  override string toString() {
-    jsdoc_tags (this, _, _, _, result)
-  }
+  override string toString() { jsdoc_tags(this, _, _, _, result) }
 
   /** Gets the description associated with the tag. */
-  string getDescription() {
-    jsdoc_tag_descriptions (this, result)
-  }
+  string getDescription() { jsdoc_tag_descriptions(this, result) }
 
   /**
    * Gets the (optional) name associated with the tag, such as the name of the documented parameter
    * for a `@param` tag.
    */
-  string getName() {
-    jsdoc_tag_names (this, result)
-  }
+  string getName() { jsdoc_tag_names(this, result) }
 
   /**
    * Gets the (optional) type associated with the tag, such as the type of the documented parameter
    * for a `@param` tag.
    */
-  JSDocTypeExpr getType() {
-    result.getParent() = this
-  }
+  JSDocTypeExpr getType() { result.getParent() = this }
 
   /** Holds if this tag documents a simple name (as opposed to a name path). */
   predicate documentsSimpleName() {
-    exists (string name | name = getName() | not name.matches("%.%"))
+    exists(string name | name = getName() | not name.matches("%.%"))
   }
 
   /** Gets the toplevel in which this tag appears. */
-  TopLevel getTopLevel() {
-    result = getParent().getComment().getTopLevel()
-  }
+  TopLevel getTopLevel() { result = getParent().getComment().getTopLevel() }
 }
 
 /**
  * A `@param` tag.
  */
 class JSDocParamTag extends JSDocTag {
-  JSDocParamTag() {
-    getTitle().regexpMatch("param|arg(ument)?")
-  }
+  JSDocParamTag() { getTitle().regexpMatch("param|arg(ument)?") }
 
   /** Gets the parameter this tag refers to, if it can be determined. */
   Variable getDocumentedParameter() {
-    exists (Parameterized parm | parm.getDocumentation() = getParent() |
+    exists(Parameterized parm | parm.getDocumentation() = getParent() |
       result = parm.getParameterVariable(getName())
     )
   }
@@ -133,16 +101,12 @@ class JSDocTypeExpr extends @jsdoc_type_expr, JSDocTypeExprParent {
    * Gets the syntactic element in which this type expression is nested, which may either
    * be another type expression or a JSDoc tag.
    */
-  JSDocTypeExprParent getParent() {
-    jsdoc_type_exprs (this, _, result, _, _)
-  }
+  JSDocTypeExprParent getParent() { jsdoc_type_exprs(this, _, result, _, _) }
 
   /**
    * Gets the index of this type expression within its parent.
    */
-  int getIndex() {
-    jsdoc_type_exprs (this, _, _, result, _)
-  }
+  int getIndex() { jsdoc_type_exprs(this, _, _, result, _) }
 
   /**
    * Gets the `i`th child type expression of this type expression.
@@ -150,29 +114,25 @@ class JSDocTypeExpr extends @jsdoc_type_expr, JSDocTypeExprParent {
    * _Note_: the indices of child type expressions in their parent elements are an implementation
    * detail that may change between versions of the extractor.
    */
-  JSDocTypeExpr getChild(int i) {
-    jsdoc_type_exprs (result, _, this, i, _)
-  }
+  JSDocTypeExpr getChild(int i) { jsdoc_type_exprs(result, _, this, i, _) }
 
-  override string toString() {
-    jsdoc_type_exprs (this, _, _, _, result)
-  }
+  override string toString() { jsdoc_type_exprs(this, _, _, _, result) }
 }
 
 /** An `any` type expression `*`. */
-class JSDocAnyTypeExpr extends @jsdoc_any_type_expr, JSDocTypeExpr {}
+class JSDocAnyTypeExpr extends @jsdoc_any_type_expr, JSDocTypeExpr { }
 
 /** A null type expression. */
-class JSDocNullTypeExpr extends @jsdoc_null_type_expr, JSDocTypeExpr {}
+class JSDocNullTypeExpr extends @jsdoc_null_type_expr, JSDocTypeExpr { }
 
 /** A type expression representing the type of `undefined`. */
-class JSDocUndefinedTypeExpr extends @jsdoc_undefined_type_expr, JSDocTypeExpr {}
+class JSDocUndefinedTypeExpr extends @jsdoc_undefined_type_expr, JSDocTypeExpr { }
 
 /** A type expression representing an unknown type `?`. */
-class JSDocUnknownTypeExpr extends @jsdoc_unknown_type_expr, JSDocTypeExpr {}
+class JSDocUnknownTypeExpr extends @jsdoc_unknown_type_expr, JSDocTypeExpr { }
 
 /** A type expression representing the void type. */
-class JSDocVoidTypeExpr extends @jsdoc_void_type_expr, JSDocTypeExpr {}
+class JSDocVoidTypeExpr extends @jsdoc_void_type_expr, JSDocTypeExpr { }
 
 /** A type expression referring to a named type. */
 class JSDocNamedTypeExpr extends @jsdoc_named_type_expr, JSDocTypeExpr {
@@ -229,7 +189,7 @@ class JSDocNonNullableTypeExpr extends @jsdoc_non_nullable_type_expr, JSDocTypeE
  */
 class JSDocRecordTypeExpr extends @jsdoc_record_type_expr, JSDocTypeExpr {
   /** Gets the name of the `i`th field of the record type. */
-  string getFieldName(int i) { jsdoc_record_field_name (this, i, result) }
+  string getFieldName(int i) { jsdoc_record_field_name(this, i, result) }
 
   /** Gets the name of some field of the record type. */
   string getAFieldName() { result = getFieldName(_) }
@@ -239,7 +199,7 @@ class JSDocRecordTypeExpr extends @jsdoc_record_type_expr, JSDocTypeExpr {
 
   /** Gets the type of the field with the given name. */
   JSDocTypeExpr getFieldTypeByName(string fieldname) {
-    exists (int idx | fieldname = getFieldName(idx) and result = getFieldType(idx))
+    exists(int idx | fieldname = getFieldName(idx) and result = getFieldType(idx))
   }
 }
 
@@ -303,17 +263,11 @@ class JSDocRestParameterTypeExpr extends @jsdoc_rest_type_expr, JSDocTypeExpr {
  */
 class JSDocError extends @jsdoc_error {
   /** Gets the tag that triggered the error. */
-  JSDocTag getTag() {
-    jsdoc_errors (this, result, _, _)
-  }
+  JSDocTag getTag() { jsdoc_errors(this, result, _, _) }
 
   /** Gets the message associated with the error. */
-  string getMessage() {
-    jsdoc_errors (this, _, result, _)
-  }
+  string getMessage() { jsdoc_errors(this, _, result, _) }
 
   /** Gets a textual representation of this element. */
-  string toString() {
-    jsdoc_errors (this, _, _, result)
-  }
+  string toString() { jsdoc_errors(this, _, _, result) }
 }
diff --git a/javascript/ql/src/semmle/javascript/JSON.qll b/javascript/ql/src/semmle/javascript/JSON.qll
index ef97b384cff2..c9d796e8d5b6 100644
--- a/javascript/ql/src/semmle/javascript/JSON.qll
+++ b/javascript/ql/src/semmle/javascript/JSON.qll
@@ -8,28 +8,18 @@ import javascript
  * A JSON-encoded value, which may be a primitive value, an array or an object.
  */
 class JSONValue extends @json_value, Locatable {
-  override Location getLocation() {
-    hasLocation(this, result)
-  }
+  override Location getLocation() { hasLocation(this, result) }
 
   /** Gets the parent value to which this value belongs, if any. */
-  JSONValue getParent() {
-    json(this, _, result, _, _)
-  }
+  JSONValue getParent() { json(this, _, result, _, _) }
 
   /** Gets the `i`th child value of this value. */
-  JSONValue getChild(int i) {
-    json(result, _, this, i, _)
-  }
+  JSONValue getChild(int i) { json(result, _, this, i, _) }
 
   /** Holds if this JSON value is the top level element in its enclosing file. */
-  predicate isTopLevel() {
-    not exists(getParent())
-  }
+  predicate isTopLevel() { not exists(getParent()) }
 
-  override string toString() {
-    json(this, _, _, _, result)
-  }
+  override string toString() { json(this, _, _, _, result) }
 }
 
 /**
@@ -37,53 +27,41 @@ class JSONValue extends @json_value, Locatable {
  */
 abstract class JSONPrimitiveValue extends JSONValue {
   /** Gets a string representation of the encoded value. */
-  string getValue() {
-    json_literals(result, _, this)
-  }
+  string getValue() { json_literals(result, _, this) }
 
   /** Gets the source text of the encoded value; for strings, this includes quotes. */
-  string getRawValue() {
-    json_literals(_, result, this)
-  }
+  string getRawValue() { json_literals(_, result, this) }
 }
 
 /**
  * A JSON-encoded null value.
  */
-class JSONNull extends @json_null, JSONPrimitiveValue {
-}
+class JSONNull extends @json_null, JSONPrimitiveValue { }
 
 /**
  * A JSON-encoded Boolean value.
  */
-class JSONBoolean extends @json_boolean, JSONPrimitiveValue {
-}
+class JSONBoolean extends @json_boolean, JSONPrimitiveValue { }
 
 /**
  * A JSON-encoded number.
  */
-class JSONNumber extends @json_number, JSONPrimitiveValue {
-}
+class JSONNumber extends @json_number, JSONPrimitiveValue { }
 
 /**
  * A JSON-encoded string value.
  */
-class JSONString extends @json_string, JSONPrimitiveValue {
-}
+class JSONString extends @json_string, JSONPrimitiveValue { }
 
 /**
  * A JSON-encoded array.
  */
 class JSONArray extends @json_array, JSONValue {
   /** Gets the value of the `i`th element of this array. */
-  JSONValue getElementValue(int i) {
-    result = getChild(i)
-  }
+  JSONValue getElementValue(int i) { result = getChild(i) }
 
   /** Gets the string value of the `i`th element of this array. */
-  string getElementStringValue(int i) {
-    result = getElementValue(i).(JSONString).getValue()
-  }
+  string getElementStringValue(int i) { result = getElementValue(i).(JSONString).getValue() }
 }
 
 /**
@@ -91,21 +69,15 @@ class JSONArray extends @json_array, JSONValue {
  */
 class JSONObject extends @json_object, JSONValue {
   /** Gets the value of property `name` of this object. */
-  JSONValue getPropValue(string name) {
-    json_properties(this, name, result)
-  }
+  JSONValue getPropValue(string name) { json_properties(this, name, result) }
 
   /** Gets the string value of property `name` of this object. */
-  string getPropStringValue(string name) {
-    result = getPropValue(name).(JSONString).getValue()
-  }
+  string getPropStringValue(string name) { result = getPropValue(name).(JSONString).getValue() }
 }
 
 /**
  * An error reported by the JSON parser.
  */
 class JSONParseError extends @json_parse_error, Error {
-  override string getMessage() {
-    json_errors(this, result)
-  }
-}
\ No newline at end of file
+  override string getMessage() { json_errors(this, result) }
+}
diff --git a/javascript/ql/src/semmle/javascript/JSX.qll b/javascript/ql/src/semmle/javascript/JSX.qll
index 392debff3ee8..b0d7e65f04ba 100644
--- a/javascript/ql/src/semmle/javascript/JSX.qll
+++ b/javascript/ql/src/semmle/javascript/JSX.qll
@@ -9,21 +9,15 @@ import javascript
  */
 class JSXNode extends Expr, @jsxelement {
   /** Gets the `i`th element in the body of this element or fragment. */
-  Expr getBodyElement(int i) {
-    i >= 0 and result = getChildExpr(-i-2)
-  }
+  Expr getBodyElement(int i) { i >= 0 and result = getChildExpr(-i - 2) }
 
   /** Gets an element in the body of this element or fragment. */
-  Expr getABodyElement() {
-    result = getBodyElement(_)
-  }
+  Expr getABodyElement() { result = getBodyElement(_) }
 
   /**
    * Gets the parent JSX element or fragment of this element.
    */
-  JSXNode getJsxParent() {
-    this = result.getABodyElement()
-  }
+  JSXNode getJsxParent() { this = result.getABodyElement() }
 }
 
 /**
@@ -32,34 +26,22 @@ class JSXNode extends Expr, @jsxelement {
 class JSXElement extends JSXNode {
   JSXName name;
 
-  JSXElement() {
-    name = getChildExpr(-1)
-  }
+  JSXElement() { name = getChildExpr(-1) }
 
   /** Gets the expression denoting the name of this element. */
-  JSXName getNameExpr() {
-    result = name
-  }
+  JSXName getNameExpr() { result = name }
 
   /** Gets the name of this element. */
-  string getName() {
-    result = name.getValue()
-  }
+  string getName() { result = name.getValue() }
 
   /** Gets the `i`th attribute of this element. */
-  JSXAttribute getAttribute(int i) {
-    properties(result, this, i, _, _)
-  }
+  JSXAttribute getAttribute(int i) { properties(result, this, i, _, _) }
 
   /** Gets an attribute of this element. */
-  JSXAttribute getAnAttribute() {
-    result = getAttribute(_)
-  }
+  JSXAttribute getAnAttribute() { result = getAttribute(_) }
 
   /** Gets the attribute of this element with the given name, if any. */
-  JSXAttribute getAttributeByName(string n) {
-    result = getAnAttribute() and result.getName() = n
-  }
+  JSXAttribute getAttributeByName(string n) { result = getAnAttribute() and result.getName() = n }
 
   override ControlFlowNode getFirstControlFlowNode() {
     result = getNameExpr().getFirstControlFlowNode()
@@ -70,12 +52,11 @@ class JSXElement extends JSXNode {
  * A JSX fragment such as `<><h1>Title</h1>Some <b>text</b></>`.
  */
 class JSXFragment extends JSXNode {
-  JSXFragment() {
-    not exists(getChildExpr(-1))
-  }
+  JSXFragment() { not exists(getChildExpr(-1)) }
 
   override ControlFlowNode getFirstControlFlowNode() {
-    result = getBodyElement(0).getFirstControlFlowNode() or
+    result = getBodyElement(0).getFirstControlFlowNode()
+    or
     not exists(getABodyElement()) and result = this
   }
 }
@@ -89,42 +70,31 @@ class JSXAttribute extends ASTNode, @jsx_attribute {
    *
    * This is not defined for spread attributes.
    */
-  JSXName getNameExpr() {
-    result = getChildExpr(0)
-  }
+  JSXName getNameExpr() { result = getChildExpr(0) }
 
   /**
    * Gets the name of this attribute.
    *
    * This is not defined for spread attributes.
    */
-  string getName() {
-    result = getNameExpr().getValue()
-  }
+  string getName() { result = getNameExpr().getValue() }
 
   /** Gets the expression denoting the value of this attribute. */
-  Expr getValue() {
-    result = getChildExpr(1)
-  }
+  Expr getValue() { result = getChildExpr(1) }
 
   /** Gets the value of this attribute as a constant string, if possible. */
-  string getStringValue() {
-    result = getValue().getStringValue()
-  }
+  string getStringValue() { result = getValue().getStringValue() }
 
   /** Gets the JSX element to which this attribute belongs. */
-  JSXElement getElement() {
-    this = result.getAnAttribute()
-  }
+  JSXElement getElement() { this = result.getAnAttribute() }
 
   override ControlFlowNode getFirstControlFlowNode() {
-    result = getNameExpr().getFirstControlFlowNode() or
+    result = getNameExpr().getFirstControlFlowNode()
+    or
     not exists(getNameExpr()) and result = getValue().getFirstControlFlowNode()
   }
 
-  override string toString() {
-    properties(this, _, _, _, result)
-  }
+  override string toString() { properties(this, _, _, _, result) }
 }
 
 /**
@@ -144,14 +114,10 @@ class JSXSpreadAttribute extends JSXAttribute {
  */
 class JSXQualifiedName extends Expr, @jsxqualifiedname {
   /** Gets the namespace component of this qualified name. */
-  Identifier getNamespace() {
-    result = getChildExpr(0)
-  }
+  Identifier getNamespace() { result = getChildExpr(0) }
 
   /** Gets the name component of this qualified name. */
-  Identifier getName() {
-    result = getChildExpr(1)
-  }
+  Identifier getName() { result = getChildExpr(1) }
 
   override ControlFlowNode getFirstControlFlowNode() {
     result = getNamespace().getFirstControlFlowNode()
@@ -174,11 +140,13 @@ class JSXName extends Expr {
    * Gets the string value of this name.
    */
   string getValue() {
-    result = this.(Identifier).getName() or
-    exists (DotExpr dot | dot = this |
+    result = this.(Identifier).getName()
+    or
+    exists(DotExpr dot | dot = this |
       result = dot.getBase().(JSXName).getValue() + "." + dot.getPropertyName()
-    ) or
-    exists (JSXQualifiedName qual | qual = this |
+    )
+    or
+    exists(JSXQualifiedName qual | qual = this |
       result = qual.getNamespace() + ":" + qual.getName()
     )
   }
@@ -187,22 +155,17 @@ class JSXName extends Expr {
 /**
  * An interpolating expression that interpolates nothing.
  */
-class JSXEmptyExpr extends Expr, @jsxemptyexpr {
-}
+class JSXEmptyExpr extends Expr, @jsxemptyexpr { }
 
 /**
  * A legacy `@jsx` pragma such as `@jsx React.DOM`.
  */
 class JSXPragma extends JSDocTag {
-  JSXPragma() {
-    getTitle() = "jsx"
-  }
+  JSXPragma() { getTitle() = "jsx" }
 
   /**
    * Gets the DOM name specified by the pragma; for `@jsx React.DOM`,
    * the result is `React.DOM`.
    */
-  string getDOMName() {
-    result = getDescription().trim()
-  }
+  string getDOMName() { result = getDescription().trim() }
 }
diff --git a/javascript/ql/src/semmle/javascript/JsonParsers.qll b/javascript/ql/src/semmle/javascript/JsonParsers.qll
index 760f8b9e468a..2d4fcd908b56 100644
--- a/javascript/ql/src/semmle/javascript/JsonParsers.qll
+++ b/javascript/ql/src/semmle/javascript/JsonParsers.qll
@@ -1,6 +1,7 @@
 /**
  * Provides classes for working with JSON parsers.
  */
+
 import javascript
 
 /**
@@ -23,20 +24,17 @@ abstract class JsonParserCall extends DataFlow::CallNode {
  */
 private class PlainJsonParserCall extends JsonParserCall {
   PlainJsonParserCall() {
-    exists (DataFlow::SourceNode callee | this = callee.getACall() |
+    exists(DataFlow::SourceNode callee | this = callee.getACall() |
       callee = DataFlow::globalVarRef("JSON").getAPropertyRead("parse") or
       callee = DataFlow::moduleImport("parse-json") or
       callee = DataFlow::moduleImport("json-parse-better-errors") or
-      callee = DataFlow::moduleImport("json-safe-parse"))
+      callee = DataFlow::moduleImport("json-safe-parse")
+    )
   }
 
-  override DataFlow::Node getInput() {
-    result = getArgument(0)
-  }
+  override DataFlow::Node getInput() { result = getArgument(0) }
 
-  override DataFlow::SourceNode getOutput() {
-    result = this
-  }
+  override DataFlow::SourceNode getOutput() { result = this }
 }
 
 /**
@@ -46,20 +44,20 @@ private class JsonParserCallWithWrapper extends JsonParserCall {
   string outputPropName;
 
   JsonParserCallWithWrapper() {
-    exists (DataFlow::SourceNode callee | this = callee.getACall() |
-      callee = DataFlow::moduleImport("safe-json-parse/tuple") and outputPropName = "1" or
-      callee = DataFlow::moduleImport("safe-json-parse/result") and outputPropName = "v" or
-      callee = DataFlow::moduleImport("fast-json-parse") and outputPropName = "value" or
-      callee = DataFlow::moduleImport("json-parse-safe") and outputPropName = "value")
+    exists(DataFlow::SourceNode callee | this = callee.getACall() |
+      callee = DataFlow::moduleImport("safe-json-parse/tuple") and outputPropName = "1"
+      or
+      callee = DataFlow::moduleImport("safe-json-parse/result") and outputPropName = "v"
+      or
+      callee = DataFlow::moduleImport("fast-json-parse") and outputPropName = "value"
+      or
+      callee = DataFlow::moduleImport("json-parse-safe") and outputPropName = "value"
+    )
   }
 
-  override DataFlow::Node getInput() {
-    result = getArgument(0)
-  }
+  override DataFlow::Node getInput() { result = getArgument(0) }
 
-  override DataFlow::SourceNode getOutput() {
-    result = this.getAPropertyRead(outputPropName)
-  }
+  override DataFlow::SourceNode getOutput() { result = this.getAPropertyRead(outputPropName) }
 }
 
 /**
@@ -70,11 +68,7 @@ private class JsonParserCallWithCallback extends JsonParserCall {
     this = DataFlow::moduleImport("safe-json-parse/callback").getACall()
   }
 
-  override DataFlow::Node getInput() {
-    result = getArgument(0)
-  }
+  override DataFlow::Node getInput() { result = getArgument(0) }
 
-  override DataFlow::SourceNode getOutput() {
-    result = getCallback(1).getParameter(1)
-  }
-}
\ No newline at end of file
+  override DataFlow::SourceNode getOutput() { result = getCallback(1).getParameter(1) }
+}
diff --git a/javascript/ql/src/semmle/javascript/Lines.qll b/javascript/ql/src/semmle/javascript/Lines.qll
index f58e5650fbae..da70c3f4faba 100644
--- a/javascript/ql/src/semmle/javascript/Lines.qll
+++ b/javascript/ql/src/semmle/javascript/Lines.qll
@@ -14,21 +14,16 @@ import javascript
  * extracted with the `--extract-program-text` flag.
  */
 class Line extends @line, Locatable {
-  override Location getLocation() {
-    hasLocation(this, result)
-  }
+  override Location getLocation() { hasLocation(this, result) }
 
   /** Gets the toplevel element this line belongs to. */
-  TopLevel getTopLevel() {
-    lines(this, result, _, _)
-  }
+  TopLevel getTopLevel() { lines(this, result, _, _) }
 
   /** Gets the text of this line, excluding the terminator character(s). */
-  string getText() {
-    lines(this, _, result, _)
-  }
+  string getText() { lines(this, _, result, _) }
 
-  /** Gets the terminator character(s) of this line.
+  /**
+   * Gets the terminator character(s) of this line.
    *
    * This predicate may return:
    *
@@ -39,11 +34,10 @@ class Line extends @line, Locatable {
    *   or `\u2029` (Unicode character PARAGRAPH SEPARATOR);
    * - the two-character string `\r\n` (carriage return followed by newline).
    */
-  string getTerminator() {
-    lines(this, _, _, result)
-  }
+  string getTerminator() { lines(this, _, _, result) }
 
-  /** Gets the indentation character used by this line.
+  /**
+   * Gets the indentation character used by this line.
    *
    * The indentation character of a line is defined to be the whitespace character
    * `c` such that the line starts with one or more instances of `c`, followed by a
@@ -52,11 +46,7 @@ class Line extends @line, Locatable {
    * If the line does not start with a whitespace character, or with a mixture of
    * different whitespace characters, its indentation character is undefined.
    */
-  string getIndentChar() {
-    result = getText().regexpCapture("(\\s)\\1*\\S.*", 1)
-  }
+  string getIndentChar() { result = getText().regexpCapture("(\\s)\\1*\\S.*", 1) }
 
-  override string toString() {
-    result = getText()
-  }
-}
\ No newline at end of file
+  override string toString() { result = getText() }
+}
diff --git a/javascript/ql/src/semmle/javascript/Locations.qll b/javascript/ql/src/semmle/javascript/Locations.qll
index 876ba56361c0..92cb471c7623 100644
--- a/javascript/ql/src/semmle/javascript/Locations.qll
+++ b/javascript/ql/src/semmle/javascript/Locations.qll
@@ -10,41 +10,30 @@ import javascript
  */
 class Location extends @location {
   /** Gets the file for this location. */
-  File getFile() {
-    locations_default(this, result, _, _, _, _)
-  }
+  File getFile() { locations_default(this, result, _, _, _, _) }
 
   /** Gets the start line of this location. */
-  int getStartLine() {
-    locations_default(this, _, result, _, _, _)
-  }
+  int getStartLine() { locations_default(this, _, result, _, _, _) }
 
   /** Gets the start column of this location. */
-  int getStartColumn() {
-    locations_default(this, _, _, result, _, _)
-  }
+  int getStartColumn() { locations_default(this, _, _, result, _, _) }
 
   /** Gets the end line of this location. */
-  int getEndLine() {
-    locations_default(this, _, _, _, result, _)
-  }
+  int getEndLine() { locations_default(this, _, _, _, result, _) }
 
   /** Gets the end column of this location. */
-  int getEndColumn() {
-    locations_default(this, _, _, _, _, result)
-  }
+  int getEndColumn() { locations_default(this, _, _, _, _, result) }
 
   /** Gets the number of lines covered by this location. */
-  int getNumLines() {
-    result = getEndLine() - getStartLine() + 1
-  }
+  int getNumLines() { result = getEndLine() - getStartLine() + 1 }
 
   /** Holds if this location starts before location `that`. */
   pragma[inline]
   predicate startsBefore(Location that) {
-    exists (File f, int sl1, int sc1, int sl2, int sc2 |
+    exists(File f, int sl1, int sc1, int sl2, int sc2 |
       locations_default(this, f, sl1, sc1, _, _) and
-      locations_default(that, f, sl2, sc2, _, _) |
+      locations_default(that, f, sl2, sc2, _, _)
+    |
       sl1 < sl2
       or
       sl1 = sl2 and sc1 < sc2
@@ -54,9 +43,10 @@ class Location extends @location {
   /** Holds if this location ends after location `that`. */
   pragma[inline]
   predicate endsAfter(Location that) {
-    exists (File f, int el1, int ec1, int el2, int ec2 |
+    exists(File f, int el1, int ec1, int el2, int ec2 |
       locations_default(this, f, _, _, el1, ec1) and
-      locations_default(that, f, _, _, el2, ec2) |
+      locations_default(that, f, _, _, el2, ec2)
+    |
       el1 > el2
       or
       el1 = el2 and ec1 > ec2
@@ -67,19 +57,13 @@ class Location extends @location {
    * Holds if this location contains location `that`, meaning that it starts
    * before and ends after it.
    */
-  predicate contains(Location that) {
-    this.startsBefore(that) and this.endsAfter(that)
-  }
+  predicate contains(Location that) { this.startsBefore(that) and this.endsAfter(that) }
 
   /** Holds if this location is empty. */
-  predicate isEmpty() {
-    exists (int l, int c | locations_default(this, _, l, c, l, c-1))
-  }
+  predicate isEmpty() { exists(int l, int c | locations_default(this, _, l, c, l, c - 1)) }
 
   /** Gets a textual representation of this element. */
-  string toString() {
-    result = this.getFile().getBaseName() + ":" + this.getStartLine().toString()
-  }
+  string toString() { result = this.getFile().getBaseName() + ":" + this.getStartLine().toString() }
 
   /**
    * Holds if this element is at the specified location.
@@ -88,8 +72,9 @@ class Location extends @location {
    * For more information, see
    * [LGTM locations](https://lgtm.com/help/ql/locations).
    */
-  predicate hasLocationInfo(string filepath, int startline, int startcolumn,
-                                             int endline, int endcolumn) {
+  predicate hasLocationInfo(
+    string filepath, int startline, int startcolumn, int endline, int endcolumn
+  ) {
     exists(File f |
       locations_default(this, f, startline, startcolumn, endline, endcolumn) and
       filepath = f.getAbsolutePath()
@@ -100,9 +85,7 @@ class Location extends @location {
 /** A program element with a location. */
 class Locatable extends @locatable {
   /** Gets the file this program element comes from. */
-  File getFile() {
-    result = getLocation().getFile()
-  }
+  File getFile() { result = getLocation().getFile() }
 
   /** Gets this element's location. */
   Location getLocation() {
@@ -117,7 +100,7 @@ class Locatable extends @locatable {
    * have been extracted with the `--extract-program-text` flag.
    */
   Line getStartLine() {
-    exists (Location l1, Location l2 |
+    exists(Location l1, Location l2 |
       l1 = this.getLocation() and
       l2 = result.getLocation() and
       l1.getFile() = l2.getFile() and
@@ -132,7 +115,7 @@ class Locatable extends @locatable {
    * have been extracted with the `--extract-program-text` flag.
    */
   Line getEndLine() {
-    exists (Location l1, Location l2 |
+    exists(Location l1, Location l2 |
       l1 = this.getLocation() and
       l2 = result.getLocation() and
       l1.getFile() = l2.getFile() and
@@ -141,13 +124,11 @@ class Locatable extends @locatable {
   }
 
   /** Gets the number of lines covered by this element. */
-  int getNumLines() {
-    result = getLocation().getNumLines()
-  }
+  int getNumLines() { result = getLocation().getNumLines() }
 
   /** Gets a textual representation of this element. */
   string toString() {
     // to be overridden by subclasses
     none()
   }
-}
\ No newline at end of file
+}
diff --git a/javascript/ql/src/semmle/javascript/Modules.qll b/javascript/ql/src/semmle/javascript/Modules.qll
index f34e005b2cf5..620bc3a2cbbe 100644
--- a/javascript/ql/src/semmle/javascript/Modules.qll
+++ b/javascript/ql/src/semmle/javascript/Modules.qll
@@ -12,27 +12,19 @@ import javascript
  */
 abstract class Module extends TopLevel {
   /** Gets the full path of the file containing this module. */
-  string getPath() {
-    result = getFile().getAbsolutePath()
-  }
+  string getPath() { result = getFile().getAbsolutePath() }
 
   /** Gets the short name of this module without file extension. */
-  string getName() {
-    result = getFile().getStem()
-  }
+  string getName() { result = getFile().getStem() }
 
   /** Gets an import appearing in this module. */
-  Import getAnImport() {
-    result.getTopLevel() = this
-  }
+  Import getAnImport() { result.getTopLevel() = this }
 
   /** Gets a module from which this module imports. */
   abstract Module getAnImportedModule();
 
   /** Gets a symbol exported by this module. */
-  string getAnExportedSymbol() {
-    exports(result, _)
-  }
+  string getAnExportedSymbol() { exports(result, _) }
 
   /**
    * Holds if this module explicitly exports symbol `name` at the
@@ -61,12 +53,12 @@ abstract class Module extends TopLevel {
   predicate searchRoot(PathExpr path, Folder searchRoot, int priority) {
     path.getEnclosingModule() = this and
     priority = 0 and
-    exists (string v | v = path.getValue() |
+    exists(string v | v = path.getValue() |
       // paths starting with a dot are resolved relative to the module's directory
-      if v.matches(".%") then
-        searchRoot = getFile().getParentContainer()
-      // all other paths are resolved relative to the file system root
+      if v.matches(".%")
+      then searchRoot = getFile().getParentContainer()
       else
+        // all other paths are resolved relative to the file system root
         searchRoot.getBaseName() = ""
     )
   }
@@ -82,18 +74,19 @@ abstract class Module extends TopLevel {
   File resolve(PathExpr path) {
     path.getEnclosingModule() = this and
     (
-     // handle the case where the import path is complete
-     exists (Container c | c = path.resolve() |
-       // import may refer to a file...
-       result = c or
-       // ...or to a directory, in which case we import index.js in that directory
-       result = c.(Folder).getJavaScriptFile("index")
-     ) or
-
-     // handle the case where the import path is missing an extension
-     exists (Folder f | f = path.resolveUpTo(path.getNumComponent()-1) |
-       result = f.getJavaScriptFile(path.getBaseName())
-     )
+      // handle the case where the import path is complete
+      exists(Container c | c = path.resolve() |
+        // import may refer to a file...
+        result = c
+        or
+        // ...or to a directory, in which case we import index.js in that directory
+        result = c.(Folder).getJavaScriptFile("index")
+      )
+      or
+      // handle the case where the import path is missing an extension
+      exists(Folder f | f = path.resolveUpTo(path.getNumComponent() - 1) |
+        result = f.getJavaScriptFile(path.getBaseName())
+      )
     )
   }
 }
@@ -131,7 +124,7 @@ abstract class Import extends ASTNode {
    * the imported path.
    */
   private Module resolveAsProvidedModule() {
-    exists (JSDocTag tag |
+    exists(JSDocTag tag |
       tag.getTitle() = "providesModule" and
       tag.getParent().getComment().getTopLevel() = result and
       tag.getDescription().trim() = getImportedPath().getValue()
@@ -142,9 +135,12 @@ abstract class Import extends ASTNode {
    * Gets a module in a `node_modules/@types/` folder that matches the imported module name.
    */
   private Module resolveFromTypeRoot() {
-    result.getFile() = min(TypeRootFolder typeRoot ||
-      typeRoot.getModuleFile(getImportedPath().getValue())
-      order by typeRoot.getSearchPriority(getFile().getParentContainer()))
+    result.getFile() = min(TypeRootFolder typeRoot |
+        |
+        typeRoot.getModuleFile(getImportedPath().getValue())
+        order by
+          typeRoot.getSearchPriority(getFile().getParentContainer())
+      )
   }
 
   /**
@@ -156,12 +152,13 @@ abstract class Import extends ASTNode {
    * source module of the same name.
    */
   Module getImportedModule() {
-    if exists(resolveExternsImport()) then
-      result = resolveExternsImport()
-    else
-      (result = resolveAsProvidedModule() or
-       result = resolveImportedPath() or
-       result = resolveFromTypeRoot())
+    if exists(resolveExternsImport())
+    then result = resolveExternsImport()
+    else (
+      result = resolveAsProvidedModule() or
+      result = resolveImportedPath() or
+      result = resolveFromTypeRoot()
+    )
   }
 }
 
@@ -169,9 +166,7 @@ abstract class Import extends ASTNode {
  * A path expression that appears in a module and is resolved relative to it.
  */
 abstract class PathExprInModule extends PathExpr {
-  PathExprInModule() {
-    exists(getEnclosingModule())
-  }
+  PathExprInModule() { exists(getEnclosingModule()) }
 
   override Folder getSearchRoot(int priority) {
     getEnclosingModule().searchRoot(this, result, priority)
@@ -181,15 +176,16 @@ abstract class PathExprInModule extends PathExpr {
 /**
  * An import of a module with the given `path`, either using `require` or using `import`.
  */
-private deprecated predicate isImport(DataFlowNode nd, string moduleName) {
-  exists (Import i | i.getImportedPath().getValue() = moduleName |
+deprecated private predicate isImport(DataFlowNode nd, string moduleName) {
+  exists(Import i | i.getImportedPath().getValue() = moduleName |
     // `require("http")`
-    nd = (Require)i or
-    exists (ImportSpecifier spec | spec = i.(ImportDeclaration).getASpecifier() |
+    nd = i.(Require)
+    or
+    exists(ImportSpecifier spec | spec = i.(ImportDeclaration).getASpecifier() |
       // common, but semantically different, ways of exposing modules through imports:
-
       // `import * as http from 'http'`
-      nd = spec.(ImportNamespaceSpecifier).getLocal() or
+      nd = spec.(ImportNamespaceSpecifier).getLocal()
+      or
       // `import http from 'http'`
       nd = spec.(ImportDefaultSpecifier).getLocal()
     )
@@ -202,16 +198,11 @@ private deprecated predicate isImport(DataFlowNode nd, string moduleName) {
  * A data flow node that holds a module instance, that is, the result of
  * an import of the module.
  */
-deprecated
-class ModuleInstance extends DataFlowNode {
-  ModuleInstance() {
-    isImport(this, _)
-  }
+deprecated class ModuleInstance extends DataFlowNode {
+  ModuleInstance() { isImport(this, _) }
 
   /** Gets the path from which the module is imported. */
-  string getPath() {
-    isImport(this, result)
-  }
+  string getPath() { isImport(this, result) }
 
   /**
    * Gets an invocation of the method or constructor named `memberName` on this module instance.
@@ -223,9 +214,7 @@ class ModuleInstance extends DataFlowNode {
   /**
    * Gets a function call that invokes method `methodName` on this module instance.
    */
-  CallExpr getAMethodCall(string methodName) {
-    result = getAMemberInvocation(methodName)
-  }
+  CallExpr getAMethodCall(string methodName) { result = getAMemberInvocation(methodName) }
 
   /**
    * Gets a `new` call that invokes constructor `constructorName` on this module instance.
diff --git a/javascript/ql/src/semmle/javascript/NPM.qll b/javascript/ql/src/semmle/javascript/NPM.qll
index 12039c31f8d5..8a1e31a42953 100644
--- a/javascript/ql/src/semmle/javascript/NPM.qll
+++ b/javascript/ql/src/semmle/javascript/NPM.qll
@@ -13,49 +13,31 @@ class PackageJSON extends JSONObject {
   }
 
   /** Gets the name of this package. */
-  string getPackageName() {
-    result = getPropStringValue("name")
-  }
+  string getPackageName() { result = getPropStringValue("name") }
 
   /** Gets the version of this package. */
-  string getVersion() {
-    result = getPropStringValue("version")
-  }
+  string getVersion() { result = getPropStringValue("version") }
 
   /** Gets the description of this package. */
-  string getDescription() {
-    result = getPropStringValue("description")
-  }
+  string getDescription() { result = getPropStringValue("description") }
 
   /** Gets the array of keywords for this package. */
-  JSONArray getKeywords() {
-    result = getPropValue("keywords")
-  }
+  JSONArray getKeywords() { result = getPropValue("keywords") }
 
   /** Gets a keyword for this package. */
-  string getAKeyword() {
-    result = getKeywords().getElementStringValue(_)
-  }
+  string getAKeyword() { result = getKeywords().getElementStringValue(_) }
 
   /** Gets the homepage URL of this package. */
-  string getHomepage() {
-    result = getPropStringValue("homepage")
-  }
+  string getHomepage() { result = getPropStringValue("homepage") }
 
   /** Gets the bug tracker information of this package. */
-  BugTrackerInfo getBugs() {
-    result = getPropValue("bugs")
-  }
+  BugTrackerInfo getBugs() { result = getPropValue("bugs") }
 
   /** Gets the license information of this package. */
-  string getLicense() {
-    result = getPropStringValue("license")
-  }
+  string getLicense() { result = getPropStringValue("license") }
 
   /** Gets the author information of this package. */
-  ContributorInfo getAuthor() {
-    result = getPropValue("author")
-  }
+  ContributorInfo getAuthor() { result = getPropValue("author") }
 
   /** Gets information for a contributor to this package. */
   ContributorInfo getAContributor() {
@@ -63,66 +45,47 @@ class PackageJSON extends JSONObject {
   }
 
   /** Gets the array of files for this package. */
-  JSONArray getFiles() {
-    result = getPropValue("files")
-  }
+  JSONArray getFiles() { result = getPropValue("files") }
 
   /** Gets a file for this package. */
-  string getAFile() {
-    result = getFiles().getElementStringValue(_)
-  }
+  string getAFile() { result = getFiles().getElementStringValue(_) }
 
   /** Gets the main module of this package. */
-  string getMain() {
-    result = getPropStringValue("main")
-  }
+  string getMain() { result = getPropStringValue("main") }
 
   /** Gets the path of a command defined for this package. */
   string getBin(string cmd) {
-    (cmd = getPackageName() and result = getPropStringValue("bin")) or
-    result = ((JSONObject)getPropValue("bin")).getPropStringValue(cmd)
+    (cmd = getPackageName() and result = getPropStringValue("bin"))
+    or
+    result = (getPropValue("bin").(JSONObject)).getPropStringValue(cmd)
   }
 
   /** Gets a manual page for this package. */
   string getAManFile() {
     result = getPropStringValue("man") or
-    result = ((JSONArray)getPropValue("man")).getElementStringValue(_)
+    result = (getPropValue("man").(JSONArray)).getElementStringValue(_)
   }
 
   /** Gets information about the directories of this package. */
-  JSONObject getDirectories() {
-    result = getPropValue("directories")
-  }
+  JSONObject getDirectories() { result = getPropValue("directories") }
 
   /** Gets repository information for this package. */
-  RepositoryInfo getRepository() {
-    result = getPropValue("repository")
-  }
+  RepositoryInfo getRepository() { result = getPropValue("repository") }
 
   /** Gets information about the scripts of this package. */
-  JSONObject getScripts() {
-    result = getPropValue("scripts")
-  }
+  JSONObject getScripts() { result = getPropValue("scripts") }
 
   /** Gets configuration information for this package. */
-  JSONObject getConfig() {
-    result = getPropValue("config")
-  }
+  JSONObject getConfig() { result = getPropValue("config") }
 
   /** Gets the dependencies of this package. */
-  PackageDependencies getDependencies() {
-    result = getPropValue("dependencies")
-  }
+  PackageDependencies getDependencies() { result = getPropValue("dependencies") }
 
   /** Gets the development dependencies of this package. */
-  PackageDependencies getDevDependencies() {
-    result = getPropValue("devDependencies")
-  }
+  PackageDependencies getDevDependencies() { result = getPropValue("devDependencies") }
 
   /** Gets the peer dependencies of this package. */
-  PackageDependencies getPeerDependencies() {
-    result = getPropValue("peerDependencies")
-  }
+  PackageDependencies getPeerDependencies() { result = getPropValue("peerDependencies") }
 
   /** Gets the bundled dependencies of this package. */
   PackageDependencies getBundledDependencies() {
@@ -131,9 +94,7 @@ class PackageJSON extends JSONObject {
   }
 
   /** Gets the optional dependencies of this package. */
-  PackageDependencies getOptionalDependencies() {
-    result = getPropValue("optionalDependencies")
-  }
+  PackageDependencies getOptionalDependencies() { result = getPropValue("optionalDependencies") }
 
   /**
    * Gets a JSON object describing a group of dependencies of
@@ -143,9 +104,12 @@ class PackageJSON extends JSONObject {
    * `optionalDependencies`.
    */
   PackageDependencies getADependenciesObject(string depkind) {
-    result = getDependencies() and depkind = "" or
-    result = getDevDependencies() and depkind = "dev" or
-    result = getBundledDependencies() and depkind = "bundled" or
+    result = getDependencies() and depkind = ""
+    or
+    result = getDevDependencies() and depkind = "dev"
+    or
+    result = getBundledDependencies() and depkind = "bundled"
+    or
     result = getOptionalDependencies() and depkind = "opt"
   }
 
@@ -162,19 +126,13 @@ class PackageJSON extends JSONObject {
   }
 
   /** Gets the engine dependencies of this package. */
-  PackageDependencies getEngines() {
-    result = getPropValue("engines")
-  }
+  PackageDependencies getEngines() { result = getPropValue("engines") }
 
   /** Holds if this package has strict engine requirements. */
-  predicate isEngineStrict() {
-    ((JSONBoolean)getPropValue("engineStrict")).getValue() = "true"
-  }
+  predicate isEngineStrict() { (getPropValue("engineStrict").(JSONBoolean)).getValue() = "true" }
 
   /** Gets information about operating systems supported by this package. */
-  JSONArray getOSs() {
-    result = getPropValue("os")
-  }
+  JSONArray getOSs() { result = getPropValue("os") }
 
   /** Gets an operating system supported by this package. */
   string getWhitelistedOS() {
@@ -184,15 +142,13 @@ class PackageJSON extends JSONObject {
 
   /** Gets an operating system not supported by this package. */
   string getBlacklistedOS() {
-    exists (string str | str = getOSs().getElementStringValue(_) |
+    exists(string str | str = getOSs().getElementStringValue(_) |
       result = str.regexpCapture("!(.*)", 1)
     )
   }
 
   /** Gets information about platforms supported by this package. */
-  JSONArray getCPUs() {
-    result = getPropValue("cpu")
-  }
+  JSONArray getCPUs() { result = getPropValue("cpu") }
 
   /** Gets a platform supported by this package. */
   string getWhitelistedCPU() {
@@ -202,25 +158,19 @@ class PackageJSON extends JSONObject {
 
   /** Gets a platform not supported by this package. */
   string getBlacklistedCPU() {
-    exists (string str | str = getCPUs().getElementStringValue(_) |
+    exists(string str | str = getCPUs().getElementStringValue(_) |
       result = str.regexpCapture("!(.*)", 1)
     )
   }
 
   /** Holds if this package prefers to be installed globally. */
-  predicate isPreferGlobal() {
-    getPropValue("preferGlobal").(JSONBoolean).getValue() = "true"
-  }
+  predicate isPreferGlobal() { getPropValue("preferGlobal").(JSONBoolean).getValue() = "true" }
 
   /** Holds if this is a private package. */
-  predicate isPrivate() {
-    getPropValue("private").(JSONBoolean).getValue() = "true"
-  }
+  predicate isPrivate() { getPropValue("private").(JSONBoolean).getValue() = "true" }
 
   /** Gets publishing configuration information about this package. */
-  JSONValue getPublishConfig() {
-    result = getPropValue("publishConfig")
-  }
+  JSONValue getPublishConfig() { result = getPropValue("publishConfig") }
 
   /**
    * Gets the main module of this package.
@@ -235,20 +185,18 @@ class PackageJSON extends JSONObject {
  */
 class BugTrackerInfo extends JSONValue {
   BugTrackerInfo() {
-    exists (PackageJSON pkg | pkg.getPropValue("bugs") = this) and
+    exists(PackageJSON pkg | pkg.getPropValue("bugs") = this) and
     (this instanceof JSONObject or this instanceof JSONString)
   }
 
   /** Gets the bug tracker URL. */
   string getURL() {
-    result = ((JSONObject)this).getPropStringValue("url") or
-    result = ((JSONString)this).getValue()
+    result = (this.(JSONObject)).getPropStringValue("url") or
+    result = (this.(JSONString)).getValue()
   }
 
   /** Gets the bug reporting email address. */
-  string getEmail() {
-    result = ((JSONObject)this).getPropStringValue("email")
-  }
+  string getEmail() { result = (this.(JSONObject)).getPropStringValue("email") }
 }
 
 /**
@@ -256,7 +204,7 @@ class BugTrackerInfo extends JSONValue {
  */
 class ContributorInfo extends JSONValue {
   ContributorInfo() {
-    exists (PackageJSON pkg |
+    exists(PackageJSON pkg |
       this = pkg.getPropValue("author") or
       this = pkg.getPropValue("contributors").(JSONArray).getElementValue(_)
     ) and
@@ -269,24 +217,26 @@ class ContributorInfo extends JSONValue {
    * homepage URL.
    */
   private string parseInfo(int group) {
-    result = ((JSONString)this).getValue().regexpCapture("(.*?)(?: <(.*?)>)?(?: \\((.*)?\\))", group)
+    result = (this.(JSONString))
+          .getValue()
+          .regexpCapture("(.*?)(?: <(.*?)>)?(?: \\((.*)?\\))", group)
   }
 
   /** Gets the contributor's name. */
   string getName() {
-    result = ((JSONObject)this).getPropStringValue("name") or
+    result = (this.(JSONObject)).getPropStringValue("name") or
     result = parseInfo(1)
   }
 
   /** Gets the contributor's email address. */
   string getEmail() {
-    result = ((JSONObject)this).getPropStringValue("email") or
+    result = (this.(JSONObject)).getPropStringValue("email") or
     result = parseInfo(2)
   }
 
   /** Gets the contributor's homepage URL. */
   string getURL() {
-    result = ((JSONObject)this).getPropStringValue("url") or
+    result = (this.(JSONObject)).getPropStringValue("url") or
     result = parseInfo(3)
   }
 }
@@ -295,19 +245,13 @@ class ContributorInfo extends JSONValue {
  * A representation of repository information for an NPM package.
  */
 class RepositoryInfo extends JSONObject {
-  RepositoryInfo() {
-    exists (PackageJSON pkg | this = pkg.getPropValue("repository"))
-  }
+  RepositoryInfo() { exists(PackageJSON pkg | this = pkg.getPropValue("repository")) }
 
   /** Gets the repository type. */
-  string getType() {
-    result = getPropStringValue("type")
-  }
+  string getType() { result = getPropStringValue("type") }
 
   /** Gets the repository URL. */
-  string getURL() {
-    result = getPropStringValue("url")
-  }
+  string getURL() { result = getPropStringValue("url") }
 }
 
 /**
@@ -315,16 +259,14 @@ class RepositoryInfo extends JSONObject {
  */
 class PackageDependencies extends JSONObject {
   PackageDependencies() {
-    exists (PackageJSON pkg, string name |
+    exists(PackageJSON pkg, string name |
       name.regexpMatch("(.+D|d)ependencies|engines") and
       this = pkg.getPropValue(name)
     )
   }
 
   /** Holds if this package depends on version 'version' of package 'pkg'. */
-  predicate getADependency(string pkg, string version) {
-    version = getPropStringValue(pkg)
-  }
+  predicate getADependency(string pkg, string version) { version = getPropStringValue(pkg) }
 }
 
 /**
@@ -334,29 +276,19 @@ class NPMPackage extends @folder {
   /** The `package.json` file of this package. */
   PackageJSON pkg;
 
-  NPMPackage() {
-    pkg.getFile().getParentContainer() = this
-  }
+  NPMPackage() { pkg.getFile().getParentContainer() = this }
 
   /** Gets a textual representation of this package. */
-  string toString() {
-    result = this.(Folder).toString()
-  }
+  string toString() { result = this.(Folder).toString() }
 
   /** Gets the full file system path of this package. */
-  string getPath() {
-    result = this.(Folder).getAbsolutePath()
-  }
+  string getPath() { result = this.(Folder).getAbsolutePath() }
 
   /** Gets the `package.json` object of this package. */
-  PackageJSON getPackageJSON() {
-    result = pkg
-  }
+  PackageJSON getPackageJSON() { result = pkg }
 
   /** Gets the name of this package. */
-  string getPackageName() {
-    result = getPackageJSON().getPackageName()
-  }
+  string getPackageName() { result = getPackageJSON().getPackageName() }
 
   /** Gets the `node_modules` folder of this package. */
   Folder getNodeModulesFolder() {
@@ -371,9 +303,7 @@ class NPMPackage extends @folder {
    * and files inside the `node_modules` folder of a package are not
    * considered to belong to that package.
    */
-  File getAFile() {
-    this = packageInternalParent*(result.getParentContainer())
-  }
+  File getAFile() { this = packageInternalParent*(result.getParentContainer()) }
 
   /**
    * Gets a Node.js module belonging to this package.
@@ -382,16 +312,12 @@ class NPMPackage extends @folder {
    * and modules inside the `node_modules` folder of a package are not
    * considered to belong to that package.
    */
-  Module getAModule() {
-    result.getFile() = getAFile()
-  }
+  Module getAModule() { result.getFile() = getAFile() }
 
   /**
    * Gets the main module of this package.
    */
-  Module getMainModule() {
-    result = pkg.getMainModule()
-  }
+  Module getMainModule() { result = pkg.getMainModule() }
 }
 
 /**
@@ -401,4 +327,4 @@ class NPMPackage extends @folder {
 private Folder packageInternalParent(Container c) {
   result = c.getParentContainer() and
   not c.(Folder).getBaseName() = "node_modules"
-}
\ No newline at end of file
+}
diff --git a/javascript/ql/src/semmle/javascript/NodeJS.qll b/javascript/ql/src/semmle/javascript/NodeJS.qll
index 9503e9637cde..c6da1a96c907 100644
--- a/javascript/ql/src/semmle/javascript/NodeJS.qll
+++ b/javascript/ql/src/semmle/javascript/NodeJS.qll
@@ -13,33 +13,26 @@ class NodeModule extends Module {
   }
 
   /** Gets the `module` variable of this module. */
-  Variable getModuleVariable() {
-    result = getScope().getVariable("module")
-  }
+  Variable getModuleVariable() { result = getScope().getVariable("module") }
 
   /** Gets the `exports` variable of this module. */
-  Variable getExportsVariable() {
-    result = getScope().getVariable("exports")
-  }
+  Variable getExportsVariable() { result = getScope().getVariable("exports") }
 
   /** Gets the scope induced by this module. */
-  override ModuleScope getScope() {
-    result.getScopeElement() = this
-  }
+  override ModuleScope getScope() { result.getScopeElement() = this }
 
   /** Gets a module imported by this module. */
-  override Module getAnImportedModule() {
-    result = getAnImport().getImportedModule()
-  }
+  override Module getAnImportedModule() { result = getAnImport().getImportedModule() }
 
   /**
    * Gets an abstract value representing one or more values that may flow
    * into this module's `module.exports` property.
    */
   DefiniteAbstractValue getAModuleExportsValue() {
-    exists (AbstractProperty moduleExports |
+    exists(AbstractProperty moduleExports |
       moduleExports.getBase().(AbstractModuleObject).getModule() = this and
-      moduleExports.getPropertyName() = "exports" |
+      moduleExports.getPropertyName() = "exports"
+    |
       result = moduleExports.getAValue()
     )
   }
@@ -52,42 +45,46 @@ class NodeModule extends Module {
 
   override predicate exports(string name, ASTNode export) {
     // a property write whose base is `exports` or `module.exports`
-    exists (DataFlow::PropWrite pwn | export = pwn.getAstNode() |
+    exists(DataFlow::PropWrite pwn | export = pwn.getAstNode() |
       pwn.getBase().analyze().getAValue() = getAModuleExportsValue() and
       name = pwn.getPropertyName()
-    ) or
+    )
+    or
     // an externs definition (where appropriate)
-    exists (PropAccess pacc | export = pacc |
+    exists(PropAccess pacc | export = pacc |
       pacc.getBase().analyze().getAValue() = getAModuleExportsValue() and
       name = pacc.getPropertyName() and
-      isExterns() and exists(pacc.getDocumentation())
+      isExterns() and
+      exists(pacc.getDocumentation())
     )
   }
 
   /** Gets a symbol that the module object inherits from its prototypes. */
   private string getAnImplicitlyExportedSymbol() {
-    exists (ExternalConstructor ec | ec = getPrototypeOfExportedExpr() |
+    exists(ExternalConstructor ec | ec = getPrototypeOfExportedExpr() |
       result = ec.getAMember().getName()
       or
       ec instanceof FunctionExternal and result = "prototype"
       or
       ec instanceof ArrayExternal and
-      exists (NumberLiteral nl | result = nl.getValue() and exists(result.toInt()))
+      exists(NumberLiteral nl | result = nl.getValue() and exists(result.toInt()))
     )
   }
 
   /** Gets an externs declaration of the prototype object of a value exported by this module. */
   private ExternalConstructor getPrototypeOfExportedExpr() {
-    exists (AbstractValue exported | exported = getAModuleExportsValue() |
-      result instanceof ObjectExternal or
-      exported instanceof AbstractFunction and result instanceof FunctionExternal or
+    exists(AbstractValue exported | exported = getAModuleExportsValue() |
+      result instanceof ObjectExternal
+      or
+      exported instanceof AbstractFunction and result instanceof FunctionExternal
+      or
       exported instanceof AbstractOtherObject and result instanceof ArrayExternal
     )
   }
 
   override predicate searchRoot(PathExpr path, Folder searchRoot, int priority) {
     path.getEnclosingModule() = this and
-    exists (string pathval | pathval = path.getValue() |
+    exists(string pathval | pathval = path.getValue() |
       // paths starting with `./` or `../` are resolved relative to the importing
       // module's folder
       pathval.regexpMatch("\\.\\.?(/.*)?") and
@@ -123,8 +120,11 @@ class NodeModule extends Module {
  * </table>
  */
 predicate findNodeModulesFolder(Folder f, Folder nodeModules, int distance) {
-  nodeModules = f.getFolder("node_modules") and not f.getBaseName() = "node_modules" and distance = 0 or
-  findNodeModulesFolder(f.getParentContainer(), nodeModules, distance-1)
+  nodeModules = f.getFolder("node_modules") and
+  not f.getBaseName() = "node_modules" and
+  distance = 0
+  or
+  findNodeModulesFolder(f.getParentContainer(), nodeModules, distance - 1)
 }
 
 /**
@@ -145,29 +145,23 @@ private class RequireVariable extends Variable {
 /**
  * Holds if module `m` is in file `f`.
  */
-private predicate moduleInFile(Module m, File f) {
-  m.getFile() = f
-}
+private predicate moduleInFile(Module m, File f) { m.getFile() = f }
 
 /**
  * A `require` import.
  */
 class Require extends CallExpr, Import {
   Require() {
-    exists (RequireVariable req |
+    exists(RequireVariable req |
       this.getCallee() = req.getAnAccess() and
       // `mjs` files explicitly disallow `require`
       getFile().getExtension() != "mjs"
     )
   }
 
-  override PathExpr getImportedPath() {
-    result = getArgument(0)
-  }
+  override PathExpr getImportedPath() { result = getArgument(0) }
 
-  override Module getEnclosingModule() {
-    this = result.getAnImport()
-  }
+  override Module getEnclosingModule() { this = result.getAnImport() }
 
   override Module resolveImportedPath() {
     moduleInFile(result, load(min(int prio | moduleInFile(_, load(prio)))))
@@ -179,9 +173,7 @@ class Require extends CallExpr, Import {
    * The result can be a JavaScript file, a JSON file or a `.node` file.
    * Externs files are not treated differently from other files by this predicate.
    */
-  File getImportedFile() {
-    result = load(min(int prio | exists(load(prio))))
-  }
+  File getImportedFile() { result = load(min(int prio | exists(load(prio)))) }
 
   /**
    * Gets the file that this `require` refers to (which may not be a JavaScript file),
@@ -239,18 +231,17 @@ class Require extends CallExpr, Import {
    * `.js`, `.json` and `.node`.
    */
   private File load(int priority) {
-    exists (int r | getEnclosingModule().searchRoot(getImportedPath(), _, r) |
+    exists(int r | getEnclosingModule().searchRoot(getImportedPath(), _, r) |
       result = loadAsFile(this, r, priority - prioritiesPerCandidate() * r) or
-      result = loadAsDirectory(this, r, priority - (prioritiesPerCandidate() * r + numberOfExtensions() + 1))
+      result = loadAsDirectory(this, r,
+          priority - (prioritiesPerCandidate() * r + numberOfExtensions() + 1))
     )
   }
 }
 
 /** A literal path expression appearing in a `require` import. */
 private class LiteralRequiredPath extends PathExprInModule, ConstantString {
-  LiteralRequiredPath() {
-    exists (Require req | this.getParentExpr*() = req.getArgument(0))
-  }
+  LiteralRequiredPath() { exists(Require req | this.getParentExpr*() = req.getArgument(0)) }
 
   override string getValue() { result = this.getStringValue() }
 }
@@ -258,7 +249,7 @@ private class LiteralRequiredPath extends PathExprInModule, ConstantString {
 /** A literal path expression appearing in a call to `require.resolve`. */
 private class LiteralRequireResolvePath extends PathExprInModule, ConstantString {
   LiteralRequireResolvePath() {
-    exists (RequireVariable req, MethodCallExpr reqres |
+    exists(RequireVariable req, MethodCallExpr reqres |
       reqres.getReceiver() = req.getAnAccess() and
       reqres.getMethodName() = "resolve" and
       this.getParentExpr*() = reqres.getArgument(0)
@@ -275,9 +266,7 @@ private class DirNamePath extends PathExprInModule, VarAccess {
     getVariable().getScope() instanceof ModuleScope
   }
 
-  override string getValue() {
-    result = getFile().getParentContainer().getAbsolutePath()
-  }
+  override string getValue() { result = getFile().getParentContainer().getAbsolutePath() }
 }
 
 /** A `__filename` path expression. */
@@ -287,9 +276,7 @@ private class FileNamePath extends PathExprInModule, VarAccess {
     getVariable().getScope() instanceof ModuleScope
   }
 
-  override string getValue() {
-    result = getFile().getAbsolutePath()
-  }
+  override string getValue() { result = getFile().getAbsolutePath() }
 }
 
 /**
@@ -298,7 +285,7 @@ private class FileNamePath extends PathExprInModule, VarAccess {
  */
 private class JoinedPath extends PathExprInModule, @callexpr {
   JoinedPath() {
-    exists (MethodCallExpr call | call = this |
+    exists(MethodCallExpr call | call = this |
       call.getReceiver().(VarAccess).getName() = "path" and
       call.getMethodName() = "join" and
       call.getNumArgument() = 2 and
@@ -308,9 +295,11 @@ private class JoinedPath extends PathExprInModule, @callexpr {
   }
 
   override string getValue() {
-    exists (CallExpr call, PathExpr left, ConstantString right |
+    exists(CallExpr call, PathExpr left, ConstantString right |
       call = this and
-      left = call.getArgument(0) and right = call.getArgument(1) |
+      left = call.getArgument(0) and
+      right = call.getArgument(1)
+    |
       result = left.getValue() + "/" + right.getStringValue()
     )
   }
@@ -318,7 +307,5 @@ private class JoinedPath extends PathExprInModule, @callexpr {
 
 /** A reference to the special `module` variable. */
 class ModuleAccess extends VarAccess {
-  ModuleAccess() {
-    exists (ModuleScope ms | this = ms.getVariable("module").getAnAccess())
-  }
+  ModuleAccess() { exists(ModuleScope ms | this = ms.getVariable("module").getAnAccess()) }
 }
diff --git a/javascript/ql/src/semmle/javascript/NodeModuleResolutionImpl.qll b/javascript/ql/src/semmle/javascript/NodeModuleResolutionImpl.qll
index d062e2353e55..54b0b1ec54ee 100644
--- a/javascript/ql/src/semmle/javascript/NodeModuleResolutionImpl.qll
+++ b/javascript/ql/src/semmle/javascript/NodeModuleResolutionImpl.qll
@@ -14,34 +14,39 @@ import javascript
  * This is to ensure we find the original source file in case the compiled output is also present.
  */
 int getFileExtensionPriority(string ext) {
-  ext = "tsx" and result = 0 or
-  ext = "ts" and result = 1 or
-  ext = "jsx" and result = 2 or
-  ext = "es6" and result = 3 or
-  ext = "es" and result = 4 or
-  ext = "mjs" and result = 5 or
-  ext = "js" and result = 6 or
-  ext = "json" and result = 7 or
+  ext = "tsx" and result = 0
+  or
+  ext = "ts" and result = 1
+  or
+  ext = "jsx" and result = 2
+  or
+  ext = "es6" and result = 3
+  or
+  ext = "es" and result = 4
+  or
+  ext = "mjs" and result = 5
+  or
+  ext = "js" and result = 6
+  or
+  ext = "json" and result = 7
+  or
   ext = "node" and result = 8
 }
 
-int prioritiesPerCandidate() {
-  result = 3 * (numberOfExtensions() + 1)
-}
+int prioritiesPerCandidate() { result = 3 * (numberOfExtensions() + 1) }
 
-int numberOfExtensions() {
-  result = count(getFileExtensionPriority(_))
-}
+int numberOfExtensions() { result = count(getFileExtensionPriority(_)) }
 
 /**
  * Gets the resolution target with the given `priority` of `req`
  * when resolved from the root with priority `rootPriority`.
  */
 File loadAsFile(Require req, int rootPriority, int priority) {
-  exists (PathExpr path | path = req.getImportedPath() |
-    result = path.resolve(rootPriority) and priority = 0 or
-    exists (Folder encl | encl = path.resolveUpTo(path.getNumComponent()-1, rootPriority) |
-      result = tryExtensions(encl, path.getBaseName(), priority-1)
+  exists(PathExpr path | path = req.getImportedPath() |
+    result = path.resolve(rootPriority) and priority = 0
+    or
+    exists(Folder encl | encl = path.resolveUpTo(path.getNumComponent() - 1, rootPriority) |
+      result = tryExtensions(encl, path.getBaseName(), priority - 1)
     )
   )
 }
@@ -52,9 +57,9 @@ File loadAsFile(Require req, int rootPriority, int priority) {
  * priority `rootPriority`.
  */
 File loadAsDirectory(Require req, int rootPriority, int priority) {
-  exists (Folder dir | dir = req.getImportedPath().resolve(rootPriority) |
+  exists(Folder dir | dir = req.getImportedPath().resolve(rootPriority) |
     result = resolveMainModule(dir.(NPMPackage).getPackageJSON(), priority) or
-    result = tryExtensions(dir, "index", priority-(numberOfExtensions()+1))
+    result = tryExtensions(dir, "index", priority - (numberOfExtensions() + 1))
   )
 }
 
@@ -68,21 +73,23 @@ File loadAsDirectory(Require req, int rootPriority, int priority) {
  */
 bindingset[basename]
 File tryExtensions(Folder dir, string basename, int priority) {
-  exists (string ext | result = dir.getFile(basename, ext) | priority = getFileExtensionPriority(ext))
+  exists(string ext | result = dir.getFile(basename, ext) |
+    priority = getFileExtensionPriority(ext)
+  )
 }
 
 /**
  * Gets the main module described by `pkg` with the given `priority`.
  */
 File resolveMainModule(PackageJSON pkg, int priority) {
-  if exists(MainModulePath::of(pkg)) then
-    exists (Container c | c = MainModulePath::of(pkg).resolve() |
+  if exists(MainModulePath::of(pkg))
+  then
+    exists(Container c | c = MainModulePath::of(pkg).resolve() |
       result = c and priority = 0
       or
       result = tryExtensions(c, "index", priority)
     )
-  else
-    result = tryExtensions(pkg.getFile().getParentContainer(), "index", priority)
+  else result = tryExtensions(pkg.getFile().getParentContainer(), "index", priority)
 }
 
 /**
@@ -92,18 +99,12 @@ File resolveMainModule(PackageJSON pkg, int priority) {
 class MainModulePath extends PathExpr, @json_string {
   PackageJSON pkg;
 
-  MainModulePath() {
-    this = pkg.getPropValue("main")
-  }
+  MainModulePath() { this = pkg.getPropValue("main") }
 
   /** Gets the `package.json` file in which this path occurs. */
-  PackageJSON getPackageJSON() {
-    result = pkg
-  }
+  PackageJSON getPackageJSON() { result = pkg }
 
-  override string getValue() {
-    result = this.(JSONString).getValue()
-  }
+  override string getValue() { result = this.(JSONString).getValue() }
 
   override Folder getSearchRoot(int priority) {
     priority = 0 and
@@ -111,9 +112,4 @@ class MainModulePath extends PathExpr, @json_string {
   }
 }
 
-module MainModulePath {
-  MainModulePath of(PackageJSON pkg) {
-    result.getPackageJSON() = pkg
-  }
-}
-
+module MainModulePath { MainModulePath of(PackageJSON pkg) { result.getPackageJSON() = pkg } }
diff --git a/javascript/ql/src/semmle/javascript/Paths.qll b/javascript/ql/src/semmle/javascript/Paths.qll
index 7bbf259bdda0..516f235dd065 100644
--- a/javascript/ql/src/semmle/javascript/Paths.qll
+++ b/javascript/ql/src/semmle/javascript/Paths.qll
@@ -12,17 +12,14 @@ private newtype TPath =
   /** A root path. */
   TRootPath(string root) {
     root = any(Folder f | not exists(f.getParentContainer())).getAbsolutePath()
-  }
-  or
-  /** A path of the form `<parent>/<component>`.*/
+  } or
+  /** A path of the form `<parent>/<component>`. */
   TConsPath(Path parent, string component) {
     // make sure we can represent paths of files in snapshot
-    exists (Folder f | f = parent.getContainer() |
-      exists (f.getChildContainer(component))
-    )
+    exists(Folder f | f = parent.getContainer() | exists(f.getChildContainer(component)))
     or
     // make sure we can resolve path strings
-    exists (PathString p, int n |
+    exists(PathString p, int n |
       p.resolveUpTo(n, _) = parent and
       p.getComponent(n) = component and
       // the empty string, `.` and `..` are not valid path components
@@ -37,7 +34,7 @@ private newtype TPath =
 private string pp(TPath p) {
   p = TRootPath(result + "/")
   or
-  exists (TPath parent, string component | p = TConsPath(parent, component) |
+  exists(TPath parent, string component | p = TConsPath(parent, component) |
     result = pp(parent) + "/" + component
   )
 }
@@ -51,9 +48,7 @@ class Path extends TPath {
   /**
    * Gets the file or folder referred to by this path, if it exists.
    */
-  Container getContainer() {
-    result.getAbsolutePath() = this.toString()
-  }
+  Container getContainer() { result.getAbsolutePath() = this.toString() }
 
   /**
    * Gets a textual representation of the path, using slashes as delimiters.
@@ -65,9 +60,7 @@ class Path extends TPath {
  * The empty path, which refers to the file system root.
  */
 private class RootPath extends Path, TRootPath {
-  override string toString() {
-    this = TRootPath(result)
-  }
+  override string toString() { this = TRootPath(result) }
 }
 
 /**
@@ -75,18 +68,12 @@ private class RootPath extends Path, TRootPath {
  */
 private class ConsPath extends Path, TConsPath {
   /** Gets the parent path of this path. */
-  Path getParent() {
-    this = TConsPath(result, _)
-  }
+  Path getParent() { this = TConsPath(result, _) }
 
   /** Gets the last component of this path. */
-  string getComponent() {
-    this = TConsPath(_, result)
-  }
+  string getComponent() { this = TConsPath(_, result) }
 
-  override string toString() {
-    result = pp(this)
-  }
+  override string toString() { result = pp(this) }
 }
 
 /**
@@ -98,25 +85,20 @@ private class ConsPath extends Path, TConsPath {
  * lookup path as the fallback.
  */
 abstract class PathString extends string {
-  bindingset[this] PathString() { any() }
+  bindingset[this]
+  PathString() { any() }
 
   /** Gets a root folder relative to which this path can be resolved. */
   abstract Folder getARootFolder();
 
   /** Gets the `i`th component of this path. */
-  string getComponent(int i) {
-    result = this.splitAt("/", i)
-  }
+  string getComponent(int i) { result = this.splitAt("/", i) }
 
   /** Gets the number of components of this path. */
-  int getNumComponent() {
-    result = count(int i | exists(getComponent(i)))
-  }
+  int getNumComponent() { result = count(int i | exists(getComponent(i))) }
 
   /** Gets the base name of the folder or file this path refers to. */
-  string getBaseName() {
-    result = this.regexpCapture("(.*/|^)([^/]+)", 2)
-  }
+  string getBaseName() { result = this.regexpCapture("(.*/|^)([^/]+)", 2) }
 
   /**
    * Gets the absolute path that the sub-path consisting of the first `n`
@@ -124,18 +106,25 @@ abstract class PathString extends string {
    * given `root` folder.
    */
   Path resolveUpTo(int n, Folder root) {
-    n = 0 and result.getContainer() = root and root = getARootFolder() or
-    exists (Path base | base = resolveUpTo(n-1, root) |
-      exists (string next | next = getComponent(n-1) |
+    n = 0 and result.getContainer() = root and root = getARootFolder()
+    or
+    exists(Path base | base = resolveUpTo(n - 1, root) |
+      exists(string next | next = getComponent(n - 1) |
         // handle empty components and the special "." folder
-        (next = "" or next = ".") and result = base or
+        (next = "" or next = ".") and
+        result = base
+        or
         // handle the special ".." folder
-        next = ".." and result = base.(ConsPath).getParent() or
+        next = ".." and result = base.(ConsPath).getParent()
+        or
         // special handling for Windows drive letters when resolving absolute path:
         // the extractor populates "C:/" as a folder that has path "C:/" but name ""
-        n = 1 and next.regexpMatch("[A-Za-z]:") and
-        root.getBaseName() = "" and root.toString() = next.toUpperCase() + "/" and
-        result = base or
+        n = 1 and
+        next.regexpMatch("[A-Za-z]:") and
+        root.getBaseName() = "" and
+        root.toString() = next.toUpperCase() + "/" and
+        result = base
+        or
         // default case
         result = TConsPath(base, next)
       )
@@ -146,9 +135,7 @@ abstract class PathString extends string {
    * Gets the absolute path that this path refers to when resolved relative to
    * `root`.
    */
-  Path resolve(Folder root) {
-    result = resolveUpTo(getNumComponent(), root)
-  }
+  Path resolve(Folder root) { result = resolveUpTo(getNumComponent(), root) }
 }
 
 /**
@@ -156,9 +143,10 @@ abstract class PathString extends string {
  */
 private class PathExprBase extends Locatable {
   // We must put getEnclosingModule here for it to be usable in the characteristic predicate of PathExprInModule
-
   /** Gets the module containing this path expression, if any. */
-  Module getEnclosingModule() { result = this.(Expr).getTopLevel() or result = this.(Comment).getTopLevel() }
+  Module getEnclosingModule() {
+    result = this.(Expr).getTopLevel() or result = this.(Comment).getTopLevel()
+  }
 }
 
 /**
@@ -181,25 +169,20 @@ abstract class PathExpr extends PathExprBase {
   abstract Folder getSearchRoot(int priority);
 
   /** Gets the `i`th component of this path. */
-  string getComponent(int i) {
-    result = getValue().(PathString).getComponent(i)
-  }
+  string getComponent(int i) { result = getValue().(PathString).getComponent(i) }
 
   /** Gets the number of components of this path. */
-  int getNumComponent() {
-    result = getValue().(PathString).getNumComponent()
-  }
+  int getNumComponent() { result = getValue().(PathString).getNumComponent() }
 
   /** Gets the base name of the folder or file this path refers to. */
-  string getBaseName() {
-    result = getValue().(PathString).getBaseName()
-  }
+  string getBaseName() { result = getValue().(PathString).getBaseName() }
 
   /**
    * Gets the file or folder that the first `n` components of this path refer to
    * when resolved relative to the root folder of the given `priority`.
    */
-  pragma[nomagic] Container resolveUpTo(int n, int priority) {
+  pragma[nomagic]
+  Container resolveUpTo(int n, int priority) {
     result = getValue().(PathString).resolveUpTo(n, getSearchRoot(priority)).getContainer()
   }
 
@@ -207,28 +190,20 @@ abstract class PathExpr extends PathExprBase {
    * Gets the file or folder that this path refers to when resolved relative to
    * the root folder of the given `priority`.
    */
-  Container resolve(int priority) {
-    result = resolveUpTo(getNumComponent(), priority)
-  }
+  Container resolve(int priority) { result = resolveUpTo(getNumComponent(), priority) }
 
   /**
    * Gets the file or folder that the first `n` components of this path refer to.
    */
-  Container resolveUpTo(int n) {
-    result = resolveUpTo(n, min(int p | exists(resolveUpTo(n, p))))
-  }
+  Container resolveUpTo(int n) { result = resolveUpTo(n, min(int p | exists(resolveUpTo(n, p)))) }
 
   /** Gets the file or folder that this path refers to. */
-  Container resolve() {
-    result = resolveUpTo(getNumComponent())
-  }
+  Container resolve() { result = resolveUpTo(getNumComponent()) }
 }
 
 /** A path string derived from a path expression. */
 private class PathExprString extends PathString {
-  PathExprString() {
-    this = any(PathExpr pe).getValue()
-  }
+  PathExprString() { this = any(PathExpr pe).getValue() }
 
   override Folder getARootFolder() {
     result = any(PathExpr pe | this = pe.getValue()).getSearchRoot(_)
@@ -241,16 +216,18 @@ private class PathExprString extends PathString {
  */
 private class ConcatPath extends PathExpr {
   ConcatPath() {
-    exists (AddExpr add | this = add |
+    exists(AddExpr add | this = add |
       add.getLeftOperand() instanceof PathExpr and
       add.getRightOperand() instanceof PathExpr
     )
   }
 
   override string getValue() {
-    exists (AddExpr add, PathExpr left, PathExpr right |
+    exists(AddExpr add, PathExpr left, PathExpr right |
       this = add and
-      left = add.getLeftOperand() and right = add.getRightOperand() |
+      left = add.getLeftOperand() and
+      right = add.getRightOperand()
+    |
       result = left.getValue() + right.getValue()
     )
   }
diff --git a/javascript/ql/src/semmle/javascript/Promises.qll b/javascript/ql/src/semmle/javascript/Promises.qll
index 77bc2d66bbe5..35d8b20e167b 100644
--- a/javascript/ql/src/semmle/javascript/Promises.qll
+++ b/javascript/ql/src/semmle/javascript/Promises.qll
@@ -8,13 +8,9 @@ import javascript
  * A promise object created by the standard ECMAScript 2015 `Promise` constructor.
  */
 private class ES2015PromiseDefinition extends PromiseDefinition, DataFlow::NewNode {
-  ES2015PromiseDefinition() {
-    this = DataFlow::globalVarRef("Promise").getAnInstantiation()
-  }
+  ES2015PromiseDefinition() { this = DataFlow::globalVarRef("Promise").getAnInstantiation() }
 
-  override DataFlow::FunctionNode getExecutor()  {
-    result = getCallback(0)
-  }
+  override DataFlow::FunctionNode getExecutor() { result = getCallback(0) }
 }
 
 /**
@@ -23,9 +19,7 @@ private class ES2015PromiseDefinition extends PromiseDefinition, DataFlow::NewNo
 private class PromiseFlowStep extends DataFlow::AdditionalFlowStep {
   PromiseDefinition p;
 
-  PromiseFlowStep() {
-    this = p
-  }
+  PromiseFlowStep() { this = p }
 
   override predicate step(DataFlow::Node pred, DataFlow::Node succ) {
     pred = p.getResolveParameter().getACall().getArgument(0) and
@@ -46,8 +40,9 @@ private predicate promiseTaintStep(DataFlow::Node pred, DataFlow::Node succ) {
   // from `x` to `Promise.resolve(x)`
   pred = succ.(ResolvedPromiseDefinition).getValue()
   or
-  exists (DataFlow::MethodCallNode thn, DataFlow::FunctionNode cb |
-    thn.getMethodName() = "then" and cb = thn.getCallback(0) |
+  exists(DataFlow::MethodCallNode thn, DataFlow::FunctionNode cb |
+    thn.getMethodName() = "then" and cb = thn.getCallback(0)
+  |
     // from `p` to `x` in `p.then(x => ...)`
     pred = thn.getReceiver() and
     succ = cb.getParameter(0)
@@ -64,9 +59,7 @@ private predicate promiseTaintStep(DataFlow::Node pred, DataFlow::Node succ) {
 private class PromiseTaintStep extends TaintTracking::AdditionalTaintStep {
   DataFlow::Node source;
 
-  PromiseTaintStep() {
-    promiseTaintStep(source, this)
-  }
+  PromiseTaintStep() { promiseTaintStep(source, this) }
 
   override predicate step(DataFlow::Node pred, DataFlow::Node succ) {
     pred = source and succ = this
@@ -77,7 +70,6 @@ private class PromiseTaintStep extends TaintTracking::AdditionalTaintStep {
  * Provides classes for working with the `bluebird` library (http://bluebirdjs.com).
  */
 module Bluebird {
-
   private DataFlow::SourceNode bluebird() {
     result = DataFlow::globalVarRef("Promise") or // same as ES2015PromiseDefinition!
     result = DataFlow::moduleImport("bluebird")
@@ -87,77 +79,52 @@ module Bluebird {
    * A promise object created by the bluebird `Promise` constructor.
    */
   private class BluebirdPromiseDefinition extends PromiseDefinition, DataFlow::NewNode {
+    BluebirdPromiseDefinition() { this = bluebird().getAnInstantiation() }
 
-    BluebirdPromiseDefinition() {
-      this = bluebird().getAnInstantiation()
-    }
-
-    override DataFlow::FunctionNode getExecutor()  {
-      result = getCallback(0)
-    }
+    override DataFlow::FunctionNode getExecutor() { result = getCallback(0) }
   }
 
   /**
    * A resolved promise created by the bluebird `Promise.resolve` function.
    */
   class ResolvedBluebidPromiseDefinition extends ResolvedPromiseDefinition {
+    ResolvedBluebidPromiseDefinition() { this = bluebird().getAMemberCall("resolve") }
 
-    ResolvedBluebidPromiseDefinition() {
-      this = bluebird().getAMemberCall("resolve")
-    }
-
-    override DataFlow::Node getValue() {
-      result = getArgument(0)
-    }
-
+    override DataFlow::Node getValue() { result = getArgument(0) }
   }
-
 }
 
 /**
  * Provides classes for working with the `q` library (https://github.com/kriskowal/q).
  */
 module Q {
-
   /**
    * A promise object created by the q `Promise` constructor.
    */
   private class QPromiseDefinition extends PromiseDefinition, DataFlow::CallNode {
+    QPromiseDefinition() { this = DataFlow::moduleMember("q", "Promise").getACall() }
 
-    QPromiseDefinition() {
-      this = DataFlow::moduleMember("q", "Promise").getACall()
-    }
-
-    override DataFlow::FunctionNode getExecutor()  {
-      result = getCallback(0)
-    }
+    override DataFlow::FunctionNode getExecutor() { result = getCallback(0) }
   }
-
 }
 
 /**
  * A promise that is resolved with the given value.
  */
 abstract class ResolvedPromiseDefinition extends DataFlow::CallNode {
-
   /**
    * Gets the value this promise is resolved with.
    */
   abstract DataFlow::Node getValue();
-
 }
 
 /**
  * A resolved promise created by the standard ECMAScript 2015 `Promise.resolve` function.
  */
 class ResolvedES2015PromiseDefinition extends ResolvedPromiseDefinition {
-
   ResolvedES2015PromiseDefinition() {
     this = DataFlow::globalVarRef("Promise").getAMemberCall("resolve")
   }
 
-  override DataFlow::Node getValue() {
-    result = getArgument(0)
-  }
-
-}
\ No newline at end of file
+  override DataFlow::Node getValue() { result = getArgument(0) }
+}
diff --git a/javascript/ql/src/semmle/javascript/RangeAnalysis.qll b/javascript/ql/src/semmle/javascript/RangeAnalysis.qll
index 28ccbf2d0caa..5f30b2836dae 100644
--- a/javascript/ql/src/semmle/javascript/RangeAnalysis.qll
+++ b/javascript/ql/src/semmle/javascript/RangeAnalysis.qll
@@ -72,7 +72,6 @@ import javascript
  * - We assume !(x <= y) means x > y, ignoring NaN, unless a nearby comment or identifier mentions NaN.
  *
  * - We assume integer arithmetic is exact, ignoring values above 2^53.
- *
  */
 
 /**
@@ -87,14 +86,16 @@ module RangeAnalysis {
     or
     node = any(ConditionGuardNode guard).getTest().flow()
     or
-    exists (DataFlow::Node succ | isRelevant(succ) |
+    exists(DataFlow::Node succ | isRelevant(succ) |
       succ = node.getASuccessor()
       or
       linearDefinitionStep(succ, node, _, _)
       or
-      exists (BinaryExpr bin | bin instanceof AddExpr or bin instanceof SubExpr |
+      exists(BinaryExpr bin | bin instanceof AddExpr or bin instanceof SubExpr |
         succ.asExpr() = bin and
-        bin.getAnOperand().flow() = node))
+        bin.getAnOperand().flow() = node
+      )
+    )
   }
 
   /**
@@ -110,10 +111,9 @@ module RangeAnalysis {
    * Gets the definition of `node`, without unfolding phi nodes.
    */
   DataFlow::Node getDefinition(DataFlow::Node node) {
-    if hasUniquePredecessor(node) then
-      result = getDefinition(node.getAPredecessor())
-    else
-      result = node
+    if hasUniquePredecessor(node)
+    then result = getDefinition(node.getAPredecessor())
+    else result = node
   }
 
   /**
@@ -121,8 +121,9 @@ module RangeAnalysis {
    * the given increment/decrement expression.
    */
   private DataFlow::Node updateExprResult(UpdateExpr expr) {
-    exists (SsaExplicitDefinition def | def.getDef() = expr |
-      result = DataFlow::ssaDefinitionNode(def))
+    exists(SsaExplicitDefinition def | def.getDef() = expr |
+      result = DataFlow::ssaDefinitionNode(def)
+    )
     or
     expr.isPrefix() and
     result = expr.flow()
@@ -132,8 +133,9 @@ module RangeAnalysis {
    * Gets a data flow node holding the result of the given componund assignment.
    */
   private DataFlow::Node compoundAssignResult(CompoundAssignExpr expr) {
-    exists (SsaExplicitDefinition def | def.getDef() = expr |
-      result = DataFlow::ssaDefinitionNode(def))
+    exists(SsaExplicitDefinition def | def.getDef() = expr |
+      result = DataFlow::ssaDefinitionNode(def)
+    )
     or
     result = expr.flow()
   }
@@ -146,9 +148,7 @@ module RangeAnalysis {
    */
   private class Bias extends int {
     bindingset[this]
-    Bias() {
-      -536870912 < this and this < 536870912
-    }
+    Bias() { -536870912 < this and this < 536870912 }
   }
 
   /**
@@ -160,7 +160,7 @@ module RangeAnalysis {
   private predicate linearDefinitionStep(DataFlow::Node r, DataFlow::Node root, int sign, Bias bias) {
     not exists(r.asExpr().getIntValue()) and
     (
-      exists (AddExpr expr | r.asExpr() = expr |
+      exists(AddExpr expr | r.asExpr() = expr |
         // r = root + k
         root = expr.getLeftOperand().flow() and
         bias = expr.getRightOperand().getIntValue() and
@@ -169,9 +169,10 @@ module RangeAnalysis {
         // r = k + root
         bias = expr.getLeftOperand().getIntValue() and
         root = expr.getRightOperand().flow() and
-        sign = 1)
+        sign = 1
+      )
       or
-      exists (SubExpr expr | r.asExpr() = expr |
+      exists(SubExpr expr | r.asExpr() = expr |
         // r = root - k
         root = expr.getLeftOperand().flow() and
         bias = -expr.getRightOperand().getIntValue() and
@@ -180,42 +181,46 @@ module RangeAnalysis {
         // r = k - root
         bias = expr.getLeftOperand().getIntValue() and
         root = expr.getRightOperand().flow() and
-        sign = -1)
+        sign = -1
+      )
       or
-      exists (NegExpr expr | r.asExpr() = expr |
+      exists(NegExpr expr | r.asExpr() = expr |
         // r = -root
         root = expr.getOperand().flow() and
         bias = 0 and
-        sign = -1)
+        sign = -1
+      )
       or
-      exists (UpdateExpr update | r = updateExprResult(update) |
+      exists(UpdateExpr update | r = updateExprResult(update) |
         // r = ++root
         root = update.getOperand().flow() and
         sign = 1 and
-        if update instanceof IncExpr then
-          bias = 1
-        else
-          bias = -1)
+        if update instanceof IncExpr then bias = 1 else bias = -1
+      )
       or
-      exists (UpdateExpr update | r.asExpr() = update | // Return value of x++ is just x (coerced to an int)
+      exists(UpdateExpr update |
+        r.asExpr() = update // Return value of x++ is just x (coerced to an int)
+      |
         // r = root++
         root = update.getOperand().flow() and
         not update.isPrefix() and
         sign = 1 and
-        bias = 0)
+        bias = 0
+      )
       or
-      exists (CompoundAssignExpr assign | r = compoundAssignResult(assign) |
+      exists(CompoundAssignExpr assign | r = compoundAssignResult(assign) |
         root = assign.getLhs().flow() and
         sign = 1 and
         (
-          // r = root += k 
+          // r = root += k
           assign instanceof AssignAddExpr and
           bias = assign.getRhs().getIntValue()
           or
           // r = root -= k
           assign instanceof AssignSubExpr and
           bias = -assign.getRhs().getIntValue()
-        ))
+        )
+      )
     )
   }
 
@@ -223,56 +228,69 @@ module RangeAnalysis {
    * Holds if `r` can be modelled as `r = root * sign + bias`.
    */
   predicate linearDefinition(DataFlow::Node r, DataFlow::Node root, int sign, Bias bias) {
-    if hasUniquePredecessor(r) then
-      linearDefinition(r.getAPredecessor(), root, sign, bias)
-    else if linearDefinitionStep(r, _, _, _) then
-      exists (DataFlow::Node pred, int sign1, int bias1, int sign2, int bias2 |
-        // r = pred * sign1 + bias1
-        linearDefinitionStep(r, pred, sign1, bias1) and
-        // pred = root * sign2 + bias2 
-        linearDefinition(pred, root, sign2, bias2) and
-        // r = (root * sign2 + bias2) * sign1 + bias1
-        sign = sign1 * sign2 and
-        bias = bias1 + sign1 * bias2)
-    else (
-      isRelevant(r) and
-      root = r and
-      sign = 1 and
-      bias = 0
-    )
+    if hasUniquePredecessor(r)
+    then linearDefinition(r.getAPredecessor(), root, sign, bias)
+    else
+      if linearDefinitionStep(r, _, _, _)
+      then
+        exists(DataFlow::Node pred, int sign1, int bias1, int sign2, int bias2 |
+          // r = pred * sign1 + bias1
+          linearDefinitionStep(r, pred, sign1, bias1) and
+          // pred = root * sign2 + bias2
+          linearDefinition(pred, root, sign2, bias2) and
+          // r = (root * sign2 + bias2) * sign1 + bias1
+          sign = sign1 * sign2 and
+          bias = bias1 + sign1 * bias2
+        )
+      else (
+        isRelevant(r) and
+        root = r and
+        sign = 1 and
+        bias = 0
+      )
   }
 
   /**
    * Holds if `r` can be modelled as `r = xroot * xsign + yroot * ysign + bias`.
    */
-  predicate linearDefinitionSum(DataFlow::Node r, DataFlow::Node xroot, int xsign, DataFlow::Node yroot, int ysign, Bias bias) {
-    if hasUniquePredecessor(r) then
-      linearDefinitionSum(r.getAPredecessor(), xroot, xsign, yroot, ysign, bias)
-    else if exists(r.asExpr().getIntValue()) then
-      none() // do not model constants as sums
-    else (
-      exists (AddExpr add, int bias1, int bias2 | r.asExpr() = add |
-        // r = r1 + r2
-        linearDefinition(add.getLeftOperand().flow(), xroot, xsign, bias1) and
-        linearDefinition(add.getRightOperand().flow(), yroot, ysign, bias2) and
-        bias = bias1 + bias2)
-      or
-      exists (SubExpr sub, int bias1, int bias2 | r.asExpr() = sub |
-        // r = r1 - r2
-        linearDefinition(sub.getLeftOperand().flow(), xroot, xsign, bias1) and
-        linearDefinition(sub.getRightOperand().flow(), yroot, -ysign, -bias2) and // Negate right-hand operand
-        bias = bias1 + bias2)
-      or
-      linearDefinitionSum(r.asExpr().(NegExpr).getOperand().flow(), xroot, -xsign, yroot, -ysign, -bias)
-    )
+  predicate linearDefinitionSum(
+    DataFlow::Node r, DataFlow::Node xroot, int xsign, DataFlow::Node yroot, int ysign, Bias bias
+  ) {
+    if hasUniquePredecessor(r)
+    then linearDefinitionSum(r.getAPredecessor(), xroot, xsign, yroot, ysign, bias)
+    else
+      if exists(r.asExpr().getIntValue())
+      then none() // do not model constants as sums
+      else (
+        exists(AddExpr add, int bias1, int bias2 | r.asExpr() = add |
+          // r = r1 + r2
+          linearDefinition(add.getLeftOperand().flow(), xroot, xsign, bias1) and
+          linearDefinition(add.getRightOperand().flow(), yroot, ysign, bias2) and
+          bias = bias1 + bias2
+        )
+        or
+        exists(SubExpr sub, int bias1, int bias2 | r.asExpr() = sub |
+          // r = r1 - r2
+          linearDefinition(sub.getLeftOperand().flow(), xroot, xsign, bias1) and
+          linearDefinition(sub.getRightOperand().flow(), yroot, -ysign, -bias2) and // Negate right-hand operand
+          bias = bias1 + bias2
+        )
+        or
+        linearDefinitionSum(r.asExpr().(NegExpr).getOperand().flow(), xroot, -xsign, yroot, -ysign,
+          -bias)
+      )
   }
 
   /**
    * Holds if the given comparison can be modelled as `A <op> B + bias` where `<op>` is the comparison operator,
    * and `A` is `a * asign` and likewise `B` is `b * bsign`.
    */
-  predicate linearComparison(Comparison comparison, DataFlow::Node a, int asign, DataFlow::Node b, int bsign, Bias bias) {
-    exists(Expr left, Expr right, int bias1, int bias2 | left = comparison.getLeftOperand() and right = comparison.getRightOperand() |
+  predicate linearComparison(
+    Comparison comparison, DataFlow::Node a, int asign, DataFlow::Node b, int bsign, Bias bias
+  ) {
+    exists(Expr left, Expr right, int bias1, int bias2 |
+      left = comparison.getLeftOperand() and right = comparison.getRightOperand()
+    |
       // A <= B + c
       linearDefinition(left.flow(), a, asign, bias1) and
       linearDefinition(right.flow(), b, bsign, bias2) and
@@ -294,7 +312,7 @@ module RangeAnalysis {
    * Holds if the given container has a comment or identifier mentioning `NaN`.
    */
   predicate hasNaNIndicator(StmtContainer container) {
-    exists (Comment comment |
+    exists(Comment comment |
       comment.getText().regexpMatch("(?s).*N[aA]N.*") and
       comment.getFile() = container.getFile() and
       (
@@ -302,23 +320,29 @@ module RangeAnalysis {
         comment.getLocation().getEndLine() <= container.getLocation().getEndLine()
         or
         comment.getNextToken() = container.getFirstToken()
-      ))
+      )
+    )
     or
-    exists (Identifier id | id.getName() = "NaN" or id.getName() = "isNaN" |
-      id.getContainer() = container)
+    exists(Identifier id | id.getName() = "NaN" or id.getName() = "isNaN" |
+      id.getContainer() = container
+    )
   }
 
   /**
    * Holds if `guard` asserts that the outcome of `A <op> B + bias` is true, where `<op>` is a comparison operator.
    */
-  predicate linearComparisonGuard(ConditionGuardNode guard, DataFlow::Node a, int asign, string operator, DataFlow::Node b, int bsign, Bias bias) {
-    exists (Comparison compare | compare = getDefinition(guard.getTest().flow()).asExpr() |
+  predicate linearComparisonGuard(
+    ConditionGuardNode guard, DataFlow::Node a, int asign, string operator, DataFlow::Node b,
+    int bsign, Bias bias
+  ) {
+    exists(Comparison compare | compare = getDefinition(guard.getTest().flow()).asExpr() |
       linearComparison(compare, a, asign, b, bsign, bias) and
       (
         guard.getOutcome() = true and operator = compare.getOperator()
         or
         not hasNaNIndicator(guard.getContainer()) and
-        guard.getOutcome() = false and operator = negateOperator(compare.getOperator())
+        guard.getOutcome() = false and
+        operator = negateOperator(compare.getOperator())
       )
     )
   }
@@ -327,10 +351,14 @@ module RangeAnalysis {
    * Gets the binary operator whose return value is the opposite of `operator` (excluding NaN comparisons).
    */
   private string negateOperator(string operator) {
-    operator = "==" and result = "!=" or
-    operator = "===" and result = "!==" or
-    operator = "<" and result = ">=" or
-    operator = ">" and result = "<=" or
+    operator = "==" and result = "!="
+    or
+    operator = "===" and result = "!=="
+    or
+    operator = "<" and result = ">="
+    or
+    operator = ">" and result = "<="
+    or
     operator = negateOperator(result)
   }
 
@@ -341,7 +369,10 @@ module RangeAnalysis {
    *
    * The dual constraint `-B <= -A + c` is not included in this predicate.
    */
-  predicate comparisonEdge(ControlFlowNode cfg, DataFlow::Node a, int asign, DataFlow::Node b, int bsign, Bias bias, boolean sharp) {
+  predicate comparisonEdge(
+    ControlFlowNode cfg, DataFlow::Node a, int asign, DataFlow::Node b, int bsign, Bias bias,
+    boolean sharp
+  ) {
     // A <= B + c
     linearComparisonGuard(cfg, a, asign, "<=", b, bsign, bias) and
     sharp = false
@@ -359,7 +390,7 @@ module RangeAnalysis {
     sharp = true
     or
     sharp = false and
-    exists (string operator | operator = "==" or operator = "===" |
+    exists(string operator | operator = "==" or operator = "===" |
       // A == B + c   iff   A <= B + c  and  B <= A - c
       linearComparisonGuard(cfg, a, asign, operator, b, bsign, bias)
       or
@@ -373,60 +404,71 @@ module RangeAnalysis {
    * Note that this predicate is symmetric: when it holds for (left, right) it also holds for (right, left).
    */
   predicate binaryPhiNode(DataFlow::Node node, DataFlow::Node left, DataFlow::Node right) {
-    exists (SsaPhiNode phi | node = DataFlow::ssaDefinitionNode(phi) |
+    exists(SsaPhiNode phi | node = DataFlow::ssaDefinitionNode(phi) |
       isRelevant(node) and
       strictcount(phi.getAnInput()) = 2 and
       left = DataFlow::ssaDefinitionNode(phi.getAnInput()) and
       right = DataFlow::ssaDefinitionNode(phi.getAnInput()) and
-      left != right)
+      left != right
+    )
   }
 
   /**
    * Holds if `A <= B + c` can be determined based on a phi node.
    */
-  predicate phiEdge(ControlFlowNode cfg, DataFlow::Node a, int asign, DataFlow::Node b, int bsign, Bias c) {
-    exists (DataFlow::Node phi, DataFlow::Node left, DataFlow::Node right |
+  predicate phiEdge(
+    ControlFlowNode cfg, DataFlow::Node a, int asign, DataFlow::Node b, int bsign, Bias c
+  ) {
+    exists(DataFlow::Node phi, DataFlow::Node left, DataFlow::Node right |
       binaryPhiNode(phi, left, right) and
       cfg = phi.getBasicBlock()
-      |
+    |
       // Both inputs are defined in terms of the same root:
       //  phi = PHI(root + bias1, root + bias2)
-      exists (DataFlow::Node root, int sign, Bias bias1, Bias bias2 |
+      exists(DataFlow::Node root, int sign, Bias bias1, Bias bias2 |
         linearDefinition(left, root, sign, bias1) and
         linearDefinition(right, root, sign, bias2) and
         bias1 < bias2 and
         // root + bias1 <= phi <= root + bias2
         (
           // root <= phi - bias1
-          a = root and asign = 1 and
-          b = phi and bsign = 1 and
+          a = root and
+          asign = 1 and
+          b = phi and
+          bsign = 1 and
           c = -bias1
           or
           // phi <= root + bias2
-          a = phi and asign = 1 and
-          b = root and bsign = 1 and
+          a = phi and
+          asign = 1 and
+          b = root and
+          bsign = 1 and
           c = bias2
         )
       )
       or
       // One input is defined in terms of the phi node itself:
       //  phi = PHI(phi + increment, x)
-      exists (int increment, DataFlow::Node root, int sign, Bias bias |
+      exists(int increment, DataFlow::Node root, int sign, Bias bias |
         linearDefinition(left, phi, 1, increment) and
         linearDefinition(right, root, sign, bias) and
         (
           // If increment is positive (or zero):
           //   phi >= right' + bias
           increment >= 0 and
-          a = root and asign = sign and
-          b = phi and bsign = 1 and
+          a = root and
+          asign = sign and
+          b = phi and
+          bsign = 1 and
           c = -bias
           or
           // If increment is negative (or zero):
           //   phi <= right' + bias
           increment <= 0 and
-          a = phi and asign = 1 and
-          b = root and bsign = sign and
+          a = phi and
+          asign = 1 and
+          b = root and
+          bsign = sign and
           c = bias
         )
       )
@@ -438,49 +480,65 @@ module RangeAnalysis {
    *
    * Comparisons where one operand is really a constant are converted into a unary constraint.
    */
-  predicate foldedComparisonEdge(ControlFlowNode cfg, DataFlow::Node a, int asign, DataFlow::Node b, int bsign, Bias c, boolean sharp) {
+  predicate foldedComparisonEdge(
+    ControlFlowNode cfg, DataFlow::Node a, int asign, DataFlow::Node b, int bsign, Bias c,
+    boolean sharp
+  ) {
     // A <= B + c    (where A and B are not constants)
     comparisonEdge(cfg, a, asign, b, bsign, c, sharp) and
     not exists(a.asExpr().getIntValue()) and
     not exists(b.asExpr().getIntValue())
     or
     // A - k <= c  becomes  A - (-A) <= 2*(k + c)
-    exists (DataFlow::Node k, int ksign, Bias kbias, Bias value |
+    exists(DataFlow::Node k, int ksign, Bias kbias, Bias value |
       comparisonEdge(cfg, a, asign, k, ksign, kbias, sharp) and
       value = k.asExpr().getIntValue() and
       b = a and
       bsign = -asign and
-      c = 2 * (value * ksign + kbias))
+      c = 2 * (value * ksign + kbias)
+    )
     or
     // k - A <= c   becomes   -A - A <= 2(-k + c)
-    exists (DataFlow::Node k, int ksign, Bias kbias, Bias value |
+    exists(DataFlow::Node k, int ksign, Bias kbias, Bias value |
       comparisonEdge(cfg, k, ksign, b, bsign, kbias, sharp) and
       value = k.asExpr().getIntValue() and
       a = b and
       asign = -bsign and
-      c = 2 * (-value * ksign + kbias))
+      c = 2 * (-value * ksign + kbias)
+    )
     or
     // For completeness, generate a contradictory constraint for trivially false conditions.
-    exists (DataFlow::Node k, int ksign, Bias bias, int avalue, int kvalue |
+    exists(DataFlow::Node k, int ksign, Bias bias, int avalue, int kvalue |
       comparisonEdge(cfg, a, asign, k, ksign, bias, sharp) and
       avalue = a.asExpr().getIntValue() * asign and
       kvalue = k.asExpr().getIntValue() * ksign and
-      (avalue > kvalue + bias or sharp = true and avalue = kvalue + bias) and
+      (
+        avalue > kvalue + bias
+        or
+        sharp = true and avalue = kvalue + bias
+      ) and
       a = b and
       asign = bsign and
-      c = -1)
+      c = -1
+    )
   }
 
   /**
    * The set of initial edges including those from dual constraints.
    */
-  predicate seedEdge(ControlFlowNode cfg, DataFlow::Node a, int asign, DataFlow::Node b, int bsign, Bias c, boolean sharp) {
+  predicate seedEdge(
+    ControlFlowNode cfg, DataFlow::Node a, int asign, DataFlow::Node b, int bsign, Bias c,
+    boolean sharp
+  ) {
     foldedComparisonEdge(cfg, a, asign, b, bsign, c, sharp)
     or
     phiEdge(cfg, a, asign, b, bsign, c) and sharp = false
   }
 
-  private predicate seedEdgeWithDual(ControlFlowNode cfg, DataFlow::Node a, int asign, DataFlow::Node b, int bsign, Bias c, boolean sharp) {
+  private predicate seedEdgeWithDual(
+    ControlFlowNode cfg, DataFlow::Node a, int asign, DataFlow::Node b, int bsign, Bias c,
+    boolean sharp
+  ) {
     // A <= B + c
     seedEdge(cfg, a, asign, b, bsign, c, sharp)
     or
@@ -494,8 +552,16 @@ module RangeAnalysis {
    */
   bindingset[x, sharpx, y, sharpy]
   private int wideningAddition(int x, boolean sharpx, int y, boolean sharpy) {
-    (x < 0 or x = 0 and sharpx = true) and
-    (y > 0 or y = 0 and sharpy = false) and
+    (
+      x < 0
+      or
+      x = 0 and sharpx = true
+    ) and
+    (
+      y > 0
+      or
+      y = 0 and sharpy = false
+    ) and
     (
       x <= 0 and x >= 0
       or
@@ -534,24 +600,28 @@ module RangeAnalysis {
    * This means negative-weight cycles (contradictions) can be detected using simple cycle detection.
    */
   pragma[noopt]
-  private predicate extendedEdge(DataFlow::Node a, int asign, DataFlow::Node b, int bsign, Bias c, boolean sharp, ControlFlowNode cfg) {
+  private predicate extendedEdge(
+    DataFlow::Node a, int asign, DataFlow::Node b, int bsign, Bias c, boolean sharp,
+    ControlFlowNode cfg
+  ) {
     seedEdgeWithDual(cfg, a, asign, b, bsign, c, sharp)
     or
     // One of the two CFG nodes must dominate the other, and `cfg` must be bound to the dominated one.
-    exists (ControlFlowNode cfg1, ControlFlowNode cfg2 |
+    exists(ControlFlowNode cfg1, ControlFlowNode cfg2 |
       // They are in the same basic block
       extendedEdgeCandidate(a, asign, b, bsign, c, sharp, cfg1, cfg2) and
-      exists (BasicBlock bb, int i, int j |
+      exists(BasicBlock bb, int i, int j |
         bb.getNode(i) = cfg1 and
         bb.getNode(j) = cfg2 and
-        if i < j then
-          cfg = cfg2
-        else
-          cfg = cfg1)
+        if i < j then cfg = cfg2 else cfg = cfg1
+      )
       or
       // They are in different basic blocks
       extendedEdgeCandidate(a, asign, b, bsign, c, sharp, cfg1, cfg2) and
-      exists (BasicBlock cfg1BB, ReachableBasicBlock cfg1RBB, BasicBlock cfg2BB, ReachableBasicBlock cfg2RBB |
+      exists(
+        BasicBlock cfg1BB, ReachableBasicBlock cfg1RBB, BasicBlock cfg2BB,
+        ReachableBasicBlock cfg2RBB
+      |
         cfg1BB = cfg1.getBasicBlock() and
         cfg1RBB = cfg1BB.(ReachableBasicBlock) and
         cfg2BB = cfg2.getBasicBlock() and
@@ -562,7 +632,8 @@ module RangeAnalysis {
           or
           cfg2RBB.strictlyDominates(cfg1RBB) and
           cfg = cfg1
-        ))
+        )
+      )
     ) and
     cfg instanceof ControlFlowNode
   }
@@ -573,24 +644,31 @@ module RangeAnalysis {
    * This does not check for dominance between `cfg1` and `cfg2`.
    */
   pragma[nomagic]
-  private predicate extendedEdgeCandidate(DataFlow::Node a, int asign, DataFlow::Node b, int bsign, Bias c, boolean sharp, ControlFlowNode cfg1, ControlFlowNode cfg2) {
-    exists (DataFlow::Node mid, int midx, Bias c1, Bias c2, boolean sharp1, boolean sharp2 |
+  private predicate extendedEdgeCandidate(
+    DataFlow::Node a, int asign, DataFlow::Node b, int bsign, Bias c, boolean sharp,
+    ControlFlowNode cfg1, ControlFlowNode cfg2
+  ) {
+    exists(DataFlow::Node mid, int midx, Bias c1, Bias c2, boolean sharp1, boolean sharp2 |
       extendedEdge(a, asign, mid, midx, c1, sharp1, cfg1) and
       extendedEdge(mid, midx, b, bsign, c2, sharp2, cfg2) and
       (a != mid or asign != midx) and
       (b != mid or bsign != midx) and
       sharp = sharp1.booleanOr(sharp2) and
-      c = wideningAddition(c1, sharp1, c2, sharp2))
+      c = wideningAddition(c1, sharp1, c2, sharp2)
+    )
   }
 
   /**
    * Holds if there is a negative-weight edge from src to dst.
    */
-  private predicate negativeEdge(DataFlow::Node a, int asign, DataFlow::Node b, int bsign, ControlFlowNode cfg) {
-    exists (int weight, boolean sharp | extendedEdge(a, asign, b, bsign, weight, sharp, cfg) |
+  private predicate negativeEdge(
+    DataFlow::Node a, int asign, DataFlow::Node b, int bsign, ControlFlowNode cfg
+  ) {
+    exists(int weight, boolean sharp | extendedEdge(a, asign, b, bsign, weight, sharp, cfg) |
       weight = 0 and sharp = true // a strict "< 0" edge counts as negative
       or
-      weight < 0)
+      weight < 0
+    )
   }
 
   /**
@@ -599,19 +677,26 @@ module RangeAnalysis {
    * The initial outgoing edge from `src` must be derived at `cfg`.
    */
   pragma[noopt]
-  private predicate reachableByNegativeEdges(DataFlow::Node a, int asign, DataFlow::Node b, int bsign, ControlFlowNode cfg) {
+  private predicate reachableByNegativeEdges(
+    DataFlow::Node a, int asign, DataFlow::Node b, int bsign, ControlFlowNode cfg
+  ) {
     negativeEdge(a, asign, b, bsign, cfg)
     or
     exists(DataFlow::Node mid, int midx, ControlFlowNode midcfg |
       reachableByNegativeEdges(a, asign, mid, midx, cfg) and
       negativeEdge(mid, midx, b, bsign, midcfg) and
-      exists (BasicBlock bb, int i, int j |
+      exists(BasicBlock bb, int i, int j |
         bb.getNode(i) = midcfg and
         bb.getNode(j) = cfg and
-        i <= j))
+        i <= j
+      )
+    )
     or
     // Same as above, but where CFG nodes are in different basic blocks
-    exists(DataFlow::Node mid, int midx, ControlFlowNode midcfg, BasicBlock midBB, ReachableBasicBlock midRBB, BasicBlock cfgBB |
+    exists(
+      DataFlow::Node mid, int midx, ControlFlowNode midcfg, BasicBlock midBB,
+      ReachableBasicBlock midRBB, BasicBlock cfgBB
+    |
       reachableByNegativeEdges(a, asign, mid, midx, cfg) and
       negativeEdge(mid, midx, b, bsign, midcfg) and
       midBB = midcfg.getBasicBlock() and
@@ -626,6 +711,6 @@ module RangeAnalysis {
    * opposite of the expected outcome.
    */
   predicate isContradictoryGuardNode(ConditionGuardNode guard) {
-    exists (DataFlow::Node a, int asign | reachableByNegativeEdges(a, asign, a, asign, guard))
+    exists(DataFlow::Node a, int asign | reachableByNegativeEdges(a, asign, a, asign, guard))
   }
 }
diff --git a/javascript/ql/src/semmle/javascript/Regexp.qll b/javascript/ql/src/semmle/javascript/Regexp.qll
index ac34ce1ad7ac..e5de356557aa 100644
--- a/javascript/ql/src/semmle/javascript/Regexp.qll
+++ b/javascript/ql/src/semmle/javascript/Regexp.qll
@@ -12,71 +12,59 @@ private import semmle.javascript.dataflow.InferredTypes
  * An element containing a regular expression term, that is, either
  * a regular expression literal or another regular expression term.
  */
-class RegExpParent extends Locatable, @regexpparent {
-}
+class RegExpParent extends Locatable, @regexpparent { }
 
 /**
  * A regular expression term, that is, a syntactic part of a regular
  * expression literal.
  */
 abstract class RegExpTerm extends Locatable, @regexpterm {
-  override Location getLocation() {
-    hasLocation(this, result)
-  }
+  override Location getLocation() { hasLocation(this, result) }
 
   /** Gets the `i`th child term of this term. */
-  RegExpTerm getChild(int i) {
-    regexpterm(result, _, this, i, _)
-  }
+  RegExpTerm getChild(int i) { regexpterm(result, _, this, i, _) }
 
   /** Gets a child term of this term. */
-  RegExpTerm getAChild() {
-    result = getChild(_)
-  }
+  RegExpTerm getAChild() { result = getChild(_) }
 
   /** Gets the number of child terms of this term. */
-  int getNumChild() {
-    result = count(getAChild())
-  }
+  int getNumChild() { result = count(getAChild()) }
 
   /**
    * Gets the parent term of this regular expression term, or the
    * regular expression literal if this is the root term.
    */
-  RegExpParent getParent() {
-    regexpterm(this, _, result, _, _)
-  }
+  RegExpParent getParent() { regexpterm(this, _, result, _, _) }
 
   /** Gets the regular expression literal this term belongs to. */
-  RegExpLiteral getLiteral() {
-    result = getParent+()
-  }
+  RegExpLiteral getLiteral() { result = getParent+() }
 
-  override string toString() {
-    regexpterm(this, _, _, _, result)
-  }
+  override string toString() { regexpterm(this, _, _, _, result) }
 
   /** Holds if this regular expression term can match the empty string. */
   abstract predicate isNullable();
 
   /** Gets the regular expression term that is matched before this one, if any. */
   RegExpTerm getPredecessor() {
-    exists (RegExpSequence seq, int i |
+    exists(RegExpSequence seq, int i |
       seq.getChild(i) = this and
-      seq.getChild(i-getDirection()) = result
-    ) or
+      seq.getChild(i - getDirection()) = result
+    )
+    or
     result = getParent().(RegExpTerm).getPredecessor()
   }
 
   /** Gets the regular expression term that is matched after this one, if any. */
   RegExpTerm getSuccessor() {
-    exists (RegExpSequence seq, int i |
+    exists(RegExpSequence seq, int i |
       seq.getChild(i) = this and
-      seq.getChild(i+getDirection()) = result
-    ) or
-    exists (RegExpTerm parent |
+      seq.getChild(i + getDirection()) = result
+    )
+    or
+    exists(RegExpTerm parent |
       parent = getParent() and
-      not parent instanceof RegExpSubPattern |
+      not parent instanceof RegExpSubPattern
+    |
       result = parent.getSuccessor()
     )
   }
@@ -85,44 +73,32 @@ abstract class RegExpTerm extends Locatable, @regexpterm {
    * Gets the matching direction of this term: `1` if it is in a forward-matching
    * context, `-1` if it is in a backward-matching context.
    */
-  private int getDirection() {
-    if isInBackwardMatchingContext() then
-      result = -1
-    else
-      result = 1
-  }
+  private int getDirection() { if isInBackwardMatchingContext() then result = -1 else result = 1 }
 
   /**
    * Holds if this regular term is in a forward-matching context, that is,
    * it has no enclosing lookbehind assertions.
    */
-  predicate isInForwardMatchingContext() {
-    not isInBackwardMatchingContext()
-  }
+  predicate isInForwardMatchingContext() { not isInBackwardMatchingContext() }
 
   /**
    * Holds if this regular term is in a backward-matching context, that is,
    * it has an enclosing lookbehind assertions.
    */
-  predicate isInBackwardMatchingContext() {
-    this = any(RegExpLookbehind lbh).getAChild+()
-  }
+  predicate isInBackwardMatchingContext() { this = any(RegExpLookbehind lbh).getAChild+() }
 }
 
 /** A quantified regular expression term. */
 abstract class RegExpQuantifier extends RegExpTerm, @regexp_quantifier {
   /** Holds if the quantifier of this term is a greedy quantifier. */
-  predicate isGreedy() {
-    isGreedy(this)
-  }
+  predicate isGreedy() { isGreedy(this) }
 }
 
 /**
  * An escaped regular expression term, that is, a regular expression
  * term starting with a backslash.
  */
-abstract class RegExpEscape extends RegExpTerm, @regexp_escape {
-}
+abstract class RegExpEscape extends RegExpTerm, @regexp_escape { }
 
 /**
  * A constant regular expression term, that is, a regular expression
@@ -130,21 +106,15 @@ abstract class RegExpEscape extends RegExpTerm, @regexp_escape {
  */
 class RegExpConstant extends RegExpTerm, @regexp_constant {
   /** Gets the string matched by this constant term. */
-  string getValue() {
-    regexpConstValue(this, result)
-  }
+  string getValue() { regexpConstValue(this, result) }
 
   /**
    * Holds if this constant represents a valid Unicode character (as opposed
    * to a surrogate code point that does not correspond to a character by itself.)
    */
-  predicate isCharacter() {
-    any()
-  }
+  predicate isCharacter() { any() }
 
-  override predicate isNullable() {
-    none()
-  }
+  override predicate isNullable() { none() }
 }
 
 /** A character escape in a regular expression. */
@@ -153,7 +123,7 @@ class RegExpCharEscape extends RegExpEscape, RegExpConstant, @regexp_char_escape
     not (
       // unencodable characters are represented as '?' in the database
       getValue() = "?" and
-      exists (string s | s = toString().toLowerCase() |
+      exists(string s | s = toString().toLowerCase() |
         // only Unicode escapes give rise to unencodable characters
         s.matches("\\\\u%") and
         // but '\u003f' actually is the '?' character itself
@@ -166,133 +136,89 @@ class RegExpCharEscape extends RegExpEscape, RegExpConstant, @regexp_char_escape
 /** An alternative term, that is, a term of the form `a|b`. */
 class RegExpAlt extends RegExpTerm, @regexp_alt {
   /** Gets an alternative of this term. */
-  RegExpTerm getAlternative() {
-    result = getAChild()
-  }
+  RegExpTerm getAlternative() { result = getAChild() }
 
   /** Gets the number of alternatives of this term. */
-  int getNumAlternative() {
-    result = getNumChild()
-  }
+  int getNumAlternative() { result = getNumChild() }
 
-  override predicate isNullable() {
-    getAlternative().isNullable()
-  }
+  override predicate isNullable() { getAlternative().isNullable() }
 }
 
 /** A sequence term, that is, a term of the form `ab`. */
 class RegExpSequence extends RegExpTerm, @regexp_seq {
   /** Gets an element of this sequence. */
-  RegExpTerm getElement() {
-    result = getAChild()
-  }
+  RegExpTerm getElement() { result = getAChild() }
 
   /** Gets the number of elements in this sequence. */
-  int getNumElement() {
-    result = getNumChild()
-  }
+  int getNumElement() { result = getNumChild() }
 
   override predicate isNullable() {
-    forall (RegExpTerm child | child = getAChild() | child.isNullable())
+    forall(RegExpTerm child | child = getAChild() | child.isNullable())
   }
 }
 
 /** A caret assertion `^` matching the beginning of a line. */
-class RegExpCaret extends RegExpTerm, @regexp_caret {
-  override predicate isNullable() {
-    any()
-  }
-}
+class RegExpCaret extends RegExpTerm, @regexp_caret { override predicate isNullable() { any() } }
 
 /** A dollar assertion `$` matching the end of a line. */
-class RegExpDollar extends RegExpTerm, @regexp_dollar {
-  override predicate isNullable() {
-    any()
-  }
-}
+class RegExpDollar extends RegExpTerm, @regexp_dollar { override predicate isNullable() { any() } }
 
 /** A word boundary assertion `\b`. */
 class RegExpWordBoundary extends RegExpTerm, @regexp_wordboundary {
-  override predicate isNullable() {
-    any()
-  }
+  override predicate isNullable() { any() }
 }
 
 /** A non-word boundary assertion `\B`. */
 class RegExpNonWordBoundary extends RegExpTerm, @regexp_nonwordboundary {
-  override predicate isNullable() {
-    any()
-  }
+  override predicate isNullable() { any() }
 }
 
 /** A zero-width lookahead or lookbehind assertion. */
 class RegExpSubPattern extends RegExpTerm, @regexp_subpattern {
   /** Gets the lookahead term. */
-  RegExpTerm getOperand() {
-    result = getAChild()
-  }
+  RegExpTerm getOperand() { result = getAChild() }
 
-  override predicate isNullable() {
-    any()
-  }
+  override predicate isNullable() { any() }
 }
 
 /** A zero-width lookahead assertion. */
-class RegExpLookahead extends RegExpSubPattern, @regexp_lookahead {
-}
+class RegExpLookahead extends RegExpSubPattern, @regexp_lookahead { }
 
 /** A zero-width lookbehind assertion. */
-class RegExpLookbehind extends RegExpSubPattern, @regexp_lookbehind {
-}
+class RegExpLookbehind extends RegExpSubPattern, @regexp_lookbehind { }
 
 /** A positive-lookahead assertion, that is, a term of the form `(?=...)`. */
-class RegExpPositiveLookahead extends RegExpLookahead, @regexp_positive_lookahead {
-}
+class RegExpPositiveLookahead extends RegExpLookahead, @regexp_positive_lookahead { }
 
 /** A negative-lookahead assertion, that is, a term of the form `(?!...)`. */
-class RegExpNegativeLookahead extends RegExpLookahead, @regexp_negative_lookahead {
-}
+class RegExpNegativeLookahead extends RegExpLookahead, @regexp_negative_lookahead { }
 
 /** A positive-lookbehind assertion, that is, a term of the form `(?<=...)`. */
-class RegExpPositiveLookbehind extends RegExpLookbehind, @regexp_positive_lookbehind {
-}
+class RegExpPositiveLookbehind extends RegExpLookbehind, @regexp_positive_lookbehind { }
 
 /** A negative-lookbehind assertion, that is, a term of the form `(?<!...)`. */
-class RegExpNegativeLookbehind extends RegExpLookbehind, @regexp_negative_lookbehind {
-}
+class RegExpNegativeLookbehind extends RegExpLookbehind, @regexp_negative_lookbehind { }
 
 /** A star-quantified term, that is, a term of the form `...*`. */
 class RegExpStar extends RegExpQuantifier, @regexp_star {
-  override predicate isNullable() {
-    any()
-  }
+  override predicate isNullable() { any() }
 }
 
 /** A plus-quantified term, that is, a term of the form `...+`. */
 class RegExpPlus extends RegExpQuantifier, @regexp_plus {
-  override predicate isNullable() {
-    getAChild().isNullable()
-  }
+  override predicate isNullable() { getAChild().isNullable() }
 }
 
 /** An optional term, that is, a term of the form `...?`. */
-class RegExpOpt extends RegExpQuantifier, @regexp_opt {
-  override predicate isNullable() {
-    any()
-  }
-}
+class RegExpOpt extends RegExpQuantifier, @regexp_opt { override predicate isNullable() { any() } }
 
 /** A range-quantified term, that is, a term of the form `...{m,n}`. */
 class RegExpRange extends RegExpQuantifier, @regexp_range {
   /** Gets the lower bound of the range, if any. */
-  int getLowerBound() {
-    rangeQuantifierLowerBound(this, result)
-  }
+  int getLowerBound() { rangeQuantifierLowerBound(this, result) }
 
   /** Gets the upper bound of the range, if any. */
-  int getUpperBound() {
-    rangeQuantifierUpperBound(this, result)
-  }
+  int getUpperBound() { rangeQuantifierUpperBound(this, result) }
 
   override predicate isNullable() {
     getAChild().isNullable() or
@@ -301,18 +227,12 @@ class RegExpRange extends RegExpQuantifier, @regexp_range {
 }
 
 /** A dot regular expression `.`. */
-class RegExpDot extends RegExpTerm, @regexp_dot {
-  override predicate isNullable() {
-    none()
-  }
-}
+class RegExpDot extends RegExpTerm, @regexp_dot { override predicate isNullable() { none() } }
 
 /** A grouped regular expression, that is, a term of the form `(...)` or `(?:...)` */
 class RegExpGroup extends RegExpTerm, @regexp_group {
   /** Holds if this is a capture group. */
-  predicate isCapture() {
-    isCapture(this, _)
-  }
+  predicate isCapture() { isCapture(this, _) }
 
   /**
    * Gets the index of this capture group within the enclosing regular
@@ -323,59 +243,41 @@ class RegExpGroup extends RegExpTerm, @regexp_group {
    * has index 2, and the group `(?:b)` has no index, since it is
    * not a capture group.
    */
-  int getNumber() {
-    isCapture(this, result)
-  }
+  int getNumber() { isCapture(this, result) }
 
   /** Holds if this is a named capture group. */
-  predicate isNamed() {
-    isNamedCapture(this, _)
-  }
+  predicate isNamed() { isNamedCapture(this, _) }
 
   /** Gets the name of this capture group, if any. */
-  string getName() {
-    isNamedCapture(this, result)
-  }
+  string getName() { isNamedCapture(this, result) }
 
-  override predicate isNullable() {
-    getAChild().isNullable()
-  }
+  override predicate isNullable() { getAChild().isNullable() }
 }
 
 /** A normal character without special meaning in a regular expression. */
-class RegExpNormalChar extends RegExpConstant, @regexp_normal_char {
-}
+class RegExpNormalChar extends RegExpConstant, @regexp_normal_char { }
 
 /** A hexadecimal character escape such as `\x0a` in a regular expression. */
-class RegExpHexEscape extends RegExpCharEscape, @regexp_hex_escape {
-}
+class RegExpHexEscape extends RegExpCharEscape, @regexp_hex_escape { }
 
 /** A unicode character escape such as `\u000a` in a regular expression. */
-class RegExpUnicodeEscape extends RegExpCharEscape, @regexp_unicode_escape {
-}
+class RegExpUnicodeEscape extends RegExpCharEscape, @regexp_unicode_escape { }
 
 /** A decimal character escape such as `\0` in a regular expression. */
-class RegExpDecimalEscape extends RegExpCharEscape, @regexp_dec_escape {
-}
+class RegExpDecimalEscape extends RegExpCharEscape, @regexp_dec_escape { }
 
 /** An octal character escape such as `\0177` in a regular expression. */
-class RegExpOctalEscape extends RegExpCharEscape, @regexp_oct_escape {
-}
+class RegExpOctalEscape extends RegExpCharEscape, @regexp_oct_escape { }
 
 /** A control character escape such as `\ca` in a regular expression. */
-class RegExpControlEscape extends RegExpCharEscape, @regexp_ctrl_escape {
-}
+class RegExpControlEscape extends RegExpCharEscape, @regexp_ctrl_escape { }
 
 /** A character class escape such as `\w` or `\S` in a regular expression. */
 class RegExpCharacterClassEscape extends RegExpEscape, @regexp_char_class_escape {
   /** Gets the name of the character class; for example, `w` for `\w`. */
-  string getValue() {
-    charClassEscape(this, result)
-  }
+  string getValue() { charClassEscape(this, result) }
 
-  override predicate isNullable() {
-    none()
-  }
+  override predicate isNullable() { none() }
 }
 
 /** A Unicode property escape such as `\p{Number}` or `\p{Script=Greek}`. */
@@ -384,9 +286,7 @@ class RegExpUnicodePropertyEscape extends RegExpEscape, @regexp_unicode_property
    * Gets the name of this Unicode property; for example, `Number` for `\p{Number}` and
    * `Script` for `\p{Script=Greek}`.
    */
-  string getName() {
-    unicodePropertyEscapeName(this, result)
-  }
+  string getName() { unicodePropertyEscapeName(this, result) }
 
   /**
    * Gets the value of this Unicode property, if any.
@@ -394,18 +294,13 @@ class RegExpUnicodePropertyEscape extends RegExpEscape, @regexp_unicode_property
    * For example, the value of Unicode property `\p{Script=Greek}` is `Greek`, while
    * `\p{Number}` does not have a value.
    */
-  string getValue() {
-    unicodePropertyEscapeValue(this, result)
-  }
+  string getValue() { unicodePropertyEscapeValue(this, result) }
 
-  override predicate isNullable() {
-    none()
-  }
+  override predicate isNullable() { none() }
 }
 
 /** An identity escape such as `\\` or `\/` in a regular expression. */
-class RegExpIdentityEscape extends RegExpCharEscape, @regexp_id_escape {
-}
+class RegExpIdentityEscape extends RegExpCharEscape, @regexp_id_escape { }
 
 /**
  * A back reference, that is, a term of the form `\i` or `\k<name>`
@@ -415,48 +310,36 @@ class RegExpBackRef extends RegExpTerm, @regexp_backref {
   /**
    * Gets the number of the capture group this back reference refers to, if any.
    */
-  int getNumber() {
-    backref(this, result)
-  }
+  int getNumber() { backref(this, result) }
 
   /**
    * Gets the name of the capture group this back reference refers to, if any.
    */
-  string getName() {
-    namedBackref(this, result)
-  }
+  string getName() { namedBackref(this, result) }
 
   /** Gets the capture group this back reference refers to. */
   RegExpGroup getGroup() {
     result.getLiteral() = this.getLiteral() and
     (
-     result.getNumber() = this.getNumber() or
-     result.getName() = this.getName()
+      result.getNumber() = this.getNumber() or
+      result.getName() = this.getName()
     )
   }
 
-  override predicate isNullable() {
-    getGroup().isNullable()
-  }
+  override predicate isNullable() { getGroup().isNullable() }
 }
 
 /** A character class, that is, a term of the form `[...]`. */
 class RegExpCharacterClass extends RegExpTerm, @regexp_char_class {
   /** Holds if this is an inverted character class, that is, a term of the form `[^...]`. */
-  predicate isInverted() {
-    isInverted(this)
-  }
+  predicate isInverted() { isInverted(this) }
 
-  override predicate isNullable() {
-    none()
-  }
+  override predicate isNullable() { none() }
 }
 
 /** A character range in a character class in a regular expression. */
 class RegExpCharacterRange extends RegExpTerm, @regexp_char_range {
-  override predicate isNullable() {
-    none()
-  }
+  override predicate isNullable() { none() }
 
   /** Holds if `lo` is the lower bound of this character range and `hi` the upper bound. */
   predicate isRange(string lo, string hi) {
@@ -468,22 +351,14 @@ class RegExpCharacterRange extends RegExpTerm, @regexp_char_range {
 /** A parse error encountered while processing a regular expression literal. */
 class RegExpParseError extends Error, @regexp_parse_error {
   /** Gets the regular expression term that triggered the parse error. */
-  RegExpTerm getTerm() {
-    regexpParseErrors(this, result, _)
-  }
+  RegExpTerm getTerm() { regexpParseErrors(this, result, _) }
 
   /** Gets the regular expression literal in which the parse error occurred. */
-  RegExpLiteral getLiteral() {
-    result = getTerm().getLiteral()
-  }
+  RegExpLiteral getLiteral() { result = getTerm().getLiteral() }
 
-  override string getMessage() {
-    regexpParseErrors(this, _, result)
-  }
+  override string getMessage() { regexpParseErrors(this, _, result) }
 
-  override string toString() {
-    result = getMessage()
-  }
+  override string toString() { result = getMessage() }
 }
 
 /**
@@ -497,7 +372,7 @@ predicate isInterpretedAsRegExp(DataFlow::Node source) {
   exists(MethodCallExpr mce, string methodName |
     mce.getReceiver().analyze().getAType() = TTString() and
     mce.getMethodName() = methodName
-    |
+  |
     (methodName = "match" and source.asExpr() = mce.getArgument(0) and mce.getNumArgument() = 1)
     or
     (
@@ -522,4 +397,4 @@ module RegExpPatterns {
     // according to ranking by http://google.com/search?q=site:.<<TLD>>
     result = "com|org|edu|gov|uk|net|io"
   }
-}
\ No newline at end of file
+}
diff --git a/javascript/ql/src/semmle/javascript/RestrictedLocations.qll b/javascript/ql/src/semmle/javascript/RestrictedLocations.qll
index 42adfff2664d..2c3e047c61aa 100644
--- a/javascript/ql/src/semmle/javascript/RestrictedLocations.qll
+++ b/javascript/ql/src/semmle/javascript/RestrictedLocations.qll
@@ -16,16 +16,18 @@ class FirstLineOf extends Locatable {
    * For more information, see
    * [LGTM locations](https://lgtm.com/help/ql/locations).
    */
-  predicate hasLocationInfo(string filepath, int startline, int startcolumn,
-                                             int endline, int endcolumn) {
-    exists (int xl, int xc |
+  predicate hasLocationInfo(
+    string filepath, int startline, int startcolumn, int endline, int endcolumn
+  ) {
+    exists(int xl, int xc |
       getLocation().hasLocationInfo(filepath, startline, startcolumn, xl, xc) and
       startline = endline and
-      if xl = startline then
-        endcolumn = xc
+      if xl = startline
+      then endcolumn = xc
       else
-        endcolumn = max(int c | any(Location l).hasLocationInfo(filepath, startline, _,
-                                                                          startline, c))
+        endcolumn = max(int c |
+            any(Location l).hasLocationInfo(filepath, startline, _, startline, c)
+          )
     )
   }
 }
@@ -44,12 +46,13 @@ class LastLineOf extends Locatable {
    * For more information, see
    * [LGTM locations](https://lgtm.com/help/ql/locations).
    */
-  predicate hasLocationInfo(string filepath, int startline, int startcolumn,
-                                             int endline, int endcolumn) {
-    exists (int xl, int xc |
-      getLocation().hasLocationInfo(filepath, xl, xc, endline, endcolumn)
-      and startline = endline
-      and if xl = endline then startcolumn = xc else startcolumn = 1
+  predicate hasLocationInfo(
+    string filepath, int startline, int startcolumn, int endline, int endcolumn
+  ) {
+    exists(int xl, int xc |
+      getLocation().hasLocationInfo(filepath, xl, xc, endline, endcolumn) and
+      startline = endline and
+      if xl = endline then startcolumn = xc else startcolumn = 1
     )
   }
-}
\ No newline at end of file
+}
diff --git a/javascript/ql/src/semmle/javascript/SSA.qll b/javascript/ql/src/semmle/javascript/SSA.qll
index 45875c321e6b..1186a4ae2cbd 100644
--- a/javascript/ql/src/semmle/javascript/SSA.qll
+++ b/javascript/ql/src/semmle/javascript/SSA.qll
@@ -80,10 +80,10 @@ private import semmle.javascript.dataflow.Refinements
 /**
  * A variable that can be SSA converted, that is, a local variable.
  */
-class SsaSourceVariable extends LocalVariable {
-}
+class SsaSourceVariable extends LocalVariable { }
 
-private cached module Internal {
+cached
+private module Internal {
   /**
    * A data type representing SSA definitions.
    *
@@ -105,37 +105,38 @@ private cached module Internal {
    * unreachable code has no SSA definitions associated with it, and neither
    * have dead assignments (that is, assignments whose value is never read).
    */
-  cached newtype TSsaDefinition =
-       TExplicitDef(ReachableBasicBlock bb, int i, VarDef d, SsaSourceVariable v) {
-         bb.defAt(i, v, d) and
-         (
-           liveAfterDef(bb, i, v) or
-           v.isCaptured()
-         )
-       }
-    or TImplicitInit(EntryBasicBlock bb, SsaSourceVariable v) {
-         bb.getContainer() = v.getDeclaringContainer().getFunctionBoundary() and
-         (liveAtEntry(bb, v) or v.isCaptured())
-       }
-    or TCapture(ReachableBasicBlock bb, int i, SsaSourceVariable v) {
-         mayCapture(bb, i, v) and liveAfterDef(bb, i, v)
-       }
-    or TPhi(ReachableJoinBlock bb, SsaSourceVariable v) {
-         liveAtEntry(bb, v) and
-         inDefDominanceFrontier(bb, v)
-       }
-    or TRefinement(ReachableBasicBlock bb, int i, GuardControlFlowNode guard, SsaSourceVariable v) {
-         bb.getNode(i) = guard and
-         guard.getTest().(Refinement).getRefinedVar() = v and
-         liveAtEntry(bb, v)
-       }
+  cached
+  newtype TSsaDefinition =
+    TExplicitDef(ReachableBasicBlock bb, int i, VarDef d, SsaSourceVariable v) {
+      bb.defAt(i, v, d) and
+      (
+        liveAfterDef(bb, i, v) or
+        v.isCaptured()
+      )
+    } or
+    TImplicitInit(EntryBasicBlock bb, SsaSourceVariable v) {
+      bb.getContainer() = v.getDeclaringContainer().getFunctionBoundary() and
+      (liveAtEntry(bb, v) or v.isCaptured())
+    } or
+    TCapture(ReachableBasicBlock bb, int i, SsaSourceVariable v) {
+      mayCapture(bb, i, v) and liveAfterDef(bb, i, v)
+    } or
+    TPhi(ReachableJoinBlock bb, SsaSourceVariable v) {
+      liveAtEntry(bb, v) and
+      inDefDominanceFrontier(bb, v)
+    } or
+    TRefinement(ReachableBasicBlock bb, int i, GuardControlFlowNode guard, SsaSourceVariable v) {
+      bb.getNode(i) = guard and
+      guard.getTest().(Refinement).getRefinedVar() = v and
+      liveAtEntry(bb, v)
+    }
 
   /**
    * Holds if `bb` is in the dominance frontier of a block containing a definition of `v`.
    */
   pragma[noinline]
   private predicate inDefDominanceFrontier(ReachableJoinBlock bb, SsaSourceVariable v) {
-    exists (ReachableBasicBlock defbb, SsaDefinition def |
+    exists(ReachableBasicBlock defbb, SsaDefinition def |
       def.definesAt(defbb, _, v) and
       bb.inDominanceFrontierOf(defbb)
     )
@@ -145,33 +146,34 @@ private cached module Internal {
    * Holds if `v` is a captured variable which is declared in `declContainer` and read in
    * `useContainer`.
    */
-  private predicate readsCapturedVar(StmtContainer useContainer,
-                                     SsaSourceVariable v, StmtContainer declContainer) {
+  private predicate readsCapturedVar(
+    StmtContainer useContainer, SsaSourceVariable v, StmtContainer declContainer
+  ) {
     declContainer = v.getDeclaringContainer() and
-    useContainer = any(VarUse u | u.getVariable() = v).getContainer() and v.isCaptured()
+    useContainer = any(VarUse u | u.getVariable() = v).getContainer() and
+    v.isCaptured()
   }
 
   /**
    * Holds if the `i`th node of `bb` in container `sc` is entry node `nd`.
    */
-  private predicate entryNode(StmtContainer sc, ReachableBasicBlock bb, int i,
-                              ControlFlowEntryNode nd) {
+  private predicate entryNode(
+    StmtContainer sc, ReachableBasicBlock bb, int i, ControlFlowEntryNode nd
+  ) {
     sc = bb.getContainer() and bb.getNode(i) = nd
   }
 
   /**
    * Holds if the `i`th node of `bb` in container `sc` is yield expression `nd`.
    */
-  private predicate yieldNode(StmtContainer sc, ReachableBasicBlock bb, int i,
-                              YieldExpr nd) {
+  private predicate yieldNode(StmtContainer sc, ReachableBasicBlock bb, int i, YieldExpr nd) {
     sc = bb.getContainer() and bb.getNode(i) = nd
   }
 
   /**
    * Holds if the `i`th node of `bb` in container `sc` is invocation expression `nd`.
    */
-  private predicate invokeNode(StmtContainer sc, ReachableBasicBlock bb, int i,
-                               InvokeExpr nd) {
+  private predicate invokeNode(StmtContainer sc, ReachableBasicBlock bb, int i, InvokeExpr nd) {
     sc = bb.getContainer() and bb.getNode(i) = nd
   }
 
@@ -181,7 +183,7 @@ private cached module Internal {
    * introduced depends on whether `v` is live at this point in the program.
    */
   private predicate mayCapture(ReachableBasicBlock bb, int i, SsaSourceVariable v) {
-    exists (ControlFlowNode nd, StmtContainer capturingContainer, StmtContainer declContainer |
+    exists(ControlFlowNode nd, StmtContainer capturingContainer, StmtContainer declContainer |
       // capture initial value of variable declared in enclosing scope
       readsCapturedVar(capturingContainer, v, declContainer) and
       capturingContainer != declContainer and
@@ -203,7 +205,10 @@ private cached module Internal {
   /**
    * A classification of variable references into reads and writes.
    */
-  cached newtype RefKind = Read() or Write()
+  cached
+  newtype RefKind =
+    Read() or
+    Write()
 
   /**
    * Holds if the `i`th node of basic block `bb` is a reference to `v`, either a read
@@ -212,7 +217,8 @@ private cached module Internal {
   private predicate ref(ReachableBasicBlock bb, int i, SsaSourceVariable v, RefKind tp) {
     bb.useAt(i, v, _) and tp = Read()
     or
-    (mayCapture(bb, i, v) or bb.defAt(i, v, _)) and tp = Write()
+    (mayCapture(bb, i, v) or bb.defAt(i, v, _)) and
+    tp = Write()
   }
 
   /**
@@ -239,9 +245,9 @@ private cached module Internal {
    * are considered as writes of captured variables.
    */
   private predicate liveAfterDef(ReachableBasicBlock bb, int i, SsaSourceVariable v) {
-    exists (int r | r = refRank(bb, i, v, Write()) |
+    exists(int r | r = refRank(bb, i, v, Write()) |
       // the next reference to `v` inside `bb` is a read
-      r+1 = refRank(bb, _, v, Read())
+      r + 1 = refRank(bb, _, v, Read())
       or
       // this is the last reference to `v` inside `bb`, but `v` is live at entry
       // to a successor basic block of `bb`
@@ -313,8 +319,8 @@ private cached module Internal {
    * read and the read at index `i` are reads (and not writes).
    */
   private int rewindReads(ReachableBasicBlock bb, int i, SsaSourceVariable v) {
-    exists (int r | r = ssaRefRank(bb, i, v, Read()) |
-      exists (int j, RefKind k | r-1 = ssaRefRank(bb, j, v, k) |
+    exists(int r | r = ssaRefRank(bb, i, v, Read()) |
+      exists(int j, RefKind k | r - 1 = ssaRefRank(bb, j, v, k) |
         k = Read() and result = rewindReads(bb, j, v)
         or
         k = Write() and result = r
@@ -328,8 +334,8 @@ private cached module Internal {
    * Gets the SSA definition of `v` in `bb` that reaches the read of `v` at node `i`, if any.
    */
   private SsaDefinition getLocalDefinition(ReachableBasicBlock bb, int i, SsaSourceVariable v) {
-    exists (int r | r = rewindReads(bb, i, v) |
-      exists (int j | result.definesAt(bb, j, v) and ssaRefRank(bb, j, v, _) = r-1)
+    exists(int r | r = rewindReads(bb, i, v) |
+      exists(int j | result.definesAt(bb, j, v) and ssaRefRank(bb, j, v, _) = r - 1)
     )
   }
 
@@ -337,27 +343,33 @@ private cached module Internal {
    * Gets an SSA definition of `v` that reaches the end of the immediate dominator of `bb`.
    */
   pragma[noinline]
-  private SsaDefinition getDefReachingEndOfImmediateDominator(ReachableBasicBlock bb, SsaSourceVariable v) {
+  private SsaDefinition getDefReachingEndOfImmediateDominator(
+    ReachableBasicBlock bb, SsaSourceVariable v
+  ) {
     result = getDefReachingEndOf(bb.getImmediateDominator(), v)
   }
 
   /**
    * Gets an SSA definition of `v` that reaches the end of basic block `bb`.
    */
-  cached SsaDefinition getDefReachingEndOf(ReachableBasicBlock bb, SsaSourceVariable v) {
-    exists (int lastRef | lastRef = max(int i | ssaRef(bb, i, v, _)) |
+  cached
+  SsaDefinition getDefReachingEndOf(ReachableBasicBlock bb, SsaSourceVariable v) {
+    exists(int lastRef | lastRef = max(int i | ssaRef(bb, i, v, _)) |
       result = getLocalDefinition(bb, lastRef, v)
       or
       result.definesAt(bb, lastRef, v) and
       liveAtSuccEntry(bb, v)
     )
     or
-    /* In SSA form, the (unique) reaching definition of a use is the closest
+    /*
+     * In SSA form, the (unique) reaching definition of a use is the closest
      * definition that dominates the use. If two definitions dominate a node
      * then one must dominate the other, so we can find the reaching definition
-     * by following the idominance relation backwards. */
+     * by following the idominance relation backwards.
+     */
+
     result = getDefReachingEndOfImmediateDominator(bb, v) and
-    not exists (SsaDefinition ssa | ssa.definesAt(bb, _, v)) and
+    not exists(SsaDefinition ssa | ssa.definesAt(bb, _, v)) and
     liveAtSuccEntry(bb, v)
   }
 
@@ -365,7 +377,8 @@ private cached module Internal {
    * Gets the unique SSA definition of `v` whose value reaches the `i`th node of `bb`,
    * which is a use of `v`.
    */
-  cached SsaDefinition getDefinition(ReachableBasicBlock bb, int i, SsaSourceVariable v) {
+  cached
+  SsaDefinition getDefinition(ReachableBasicBlock bb, int i, SsaSourceVariable v) {
     result = getLocalDefinition(bb, i, v)
     or
     rewindReads(bb, i, v) = 1 and result = getDefReachingEndOf(bb.getImmediateDominator(), v)
@@ -378,32 +391,23 @@ private import Internal
  */
 class SsaVariable extends TSsaDefinition {
   /** Gets the source variable corresponding to this SSA variable. */
-  SsaSourceVariable getSourceVariable() {
-    result = this.(SsaDefinition).getSourceVariable()
-  }
+  SsaSourceVariable getSourceVariable() { result = this.(SsaDefinition).getSourceVariable() }
 
   /** Gets the (unique) definition of this SSA variable. */
-  SsaDefinition getDefinition() {
-    result = this
-  }
+  SsaDefinition getDefinition() { result = this }
 
   /** Gets a use in basic block `bb` that refers to this SSA variable. */
   VarUse getAUseIn(ReachableBasicBlock bb) {
-    exists (int i, SsaSourceVariable v |
-      v = getSourceVariable() |
+    exists(int i, SsaSourceVariable v | v = getSourceVariable() |
       bb.useAt(i, v, result) and this = getDefinition(bb, i, v)
     )
   }
 
   /** Gets a use that refers to this SSA variable. */
-  VarUse getAUse() {
-    result = getAUseIn(_)
-  }
+  VarUse getAUse() { result = getAUseIn(_) }
 
   /** Gets a textual representation of this element. */
-  string toString() {
-    result = getDefinition().prettyPrintRef()
-  }
+  string toString() { result = getDefinition().prettyPrintRef() }
 
   /**
    * Holds if this element is at the specified location.
@@ -412,8 +416,9 @@ class SsaVariable extends TSsaDefinition {
    * For more information, see
    * [LGTM locations](https://lgtm.com/help/ql/locations).
    */
-  predicate hasLocationInfo(string filepath, int startline, int startcolumn,
-                            int endline, int endcolumn) {
+  predicate hasLocationInfo(
+    string filepath, int startline, int startcolumn, int endline, int endcolumn
+  ) {
     getDefinition().hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
   }
 }
@@ -423,9 +428,7 @@ class SsaVariable extends TSsaDefinition {
  */
 class SsaDefinition extends TSsaDefinition {
   /** Gets the SSA variable defined by this definition. */
-  SsaVariable getVariable() {
-    result = this
-  }
+  SsaVariable getVariable() { result = this }
 
   /** Gets the source variable defined by this definition. */
   abstract SsaSourceVariable getSourceVariable();
@@ -438,7 +441,7 @@ class SsaDefinition extends TSsaDefinition {
    */
   abstract ReachableBasicBlock getBasicBlock();
 
-/**
+  /**
    * INTERNAL: Use `getBasicBlock()` and `getSourceVariable()` instead.
    *
    * Holds if this is a definition of source variable `v` at index `idx` in basic block `bb`.
@@ -478,13 +481,12 @@ class SsaDefinition extends TSsaDefinition {
    * For more information, see
    * [LGTM locations](https://lgtm.com/help/ql/locations).
    */
-  abstract predicate hasLocationInfo(string filepath, int startline, int startcolumn,
-                                     int endline, int endcolumn);
+  abstract predicate hasLocationInfo(
+    string filepath, int startline, int startcolumn, int endline, int endcolumn
+  );
 
   /** Gets the function or toplevel to which this definition belongs. */
-  StmtContainer getContainer() {
-    result = getBasicBlock().getContainer()
-  }
+  StmtContainer getContainer() { result = getBasicBlock().getContainer() }
 }
 
 /**
@@ -496,38 +498,27 @@ class SsaExplicitDefinition extends SsaDefinition, TExplicitDef {
   }
 
   /** This SSA definition corresponds to the definition of `v` at `def`. */
-  predicate defines(VarDef d, SsaSourceVariable v) {
-    this = TExplicitDef(_, _, d, v)
-  }
+  predicate defines(VarDef d, SsaSourceVariable v) { this = TExplicitDef(_, _, d, v) }
 
   /** The variable definition wrapped by this SSA definition. */
-  VarDef getDef() {
-    this = TExplicitDef(_, _, result, _)
-  }
+  VarDef getDef() { this = TExplicitDef(_, _, result, _) }
 
   /** Gets the basic block to which this definition belongs. */
-  override ReachableBasicBlock getBasicBlock() {
-    definesAt(result, _, _)
-  }
+  override ReachableBasicBlock getBasicBlock() { definesAt(result, _, _) }
 
-  override SsaSourceVariable getSourceVariable() {
-    this = TExplicitDef(_, _, _, result)
-  }
+  override SsaSourceVariable getSourceVariable() { this = TExplicitDef(_, _, _, result) }
 
-  override VarDef getAContributingVarDef() {
-    result = getDef()
-  }
+  override VarDef getAContributingVarDef() { result = getDef() }
 
   override string prettyPrintRef() {
-    exists (int l, int c | hasLocationInfo(_, l, c, _, _) |
-      result = "def@" + l + ":" + c
-    )
+    exists(int l, int c | hasLocationInfo(_, l, c, _, _) | result = "def@" + l + ":" + c)
   }
 
   override string prettyPrintDef() { result = getDef().toString() }
 
-  override predicate hasLocationInfo(string filepath, int startline, int startcolumn,
-                                     int endline, int endcolumn) {
+  override predicate hasLocationInfo(
+    string filepath, int startline, int startcolumn, int endline, int endcolumn
+  ) {
     getDef().getLocation().hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
   }
 }
@@ -544,14 +535,14 @@ abstract class SsaImplicitDefinition extends SsaDefinition {
   abstract string getKind();
 
   override string prettyPrintRef() {
-    exists (int l, int c | hasLocationInfo(_, l, c, _, _) |
-      result = getKind() + "@" + l + ":" + c
-    )
+    exists(int l, int c | hasLocationInfo(_, l, c, _, _) | result = getKind() + "@" + l + ":" + c)
   }
 
-  override predicate hasLocationInfo(string filepath, int startline, int startcolumn,
-                                     int endline, int endcolumn) {
-    endline = startline and endcolumn = startcolumn and
+  override predicate hasLocationInfo(
+    string filepath, int startline, int startcolumn, int endline, int endcolumn
+  ) {
+    endline = startline and
+    endcolumn = startcolumn and
     getBasicBlock().getLocation().hasLocationInfo(filepath, startline, startcolumn, _, _)
   }
 }
@@ -573,9 +564,7 @@ class SsaImplicitInit extends SsaImplicitDefinition, TImplicitInit {
 
   override VarDef getAContributingVarDef() { none() }
 
-  override string prettyPrintDef() {
-    result = "implicit initialization of " + getSourceVariable()
-  }
+  override string prettyPrintDef() { result = "implicit initialization of " + getSourceVariable() }
 }
 
 /**
@@ -594,21 +583,20 @@ class SsaVariableCapture extends SsaImplicitDefinition, TCapture {
 
   override SsaSourceVariable getSourceVariable() { definesAt(_, _, result) }
 
-  override VarDef getAContributingVarDef() {
-    result.getAVariable() = getSourceVariable()
-  }
+  override VarDef getAContributingVarDef() { result.getAVariable() = getSourceVariable() }
 
   override string getKind() { result = "capture" }
 
-  override string prettyPrintDef() {
-    result = "capture variable " + getSourceVariable()
-  }
+  override string prettyPrintDef() { result = "capture variable " + getSourceVariable() }
 
-  override predicate hasLocationInfo(string filepath, int startline, int startcolumn,
-                                     int endline, int endcolumn) {
-    exists (ReachableBasicBlock bb, int i | definesAt(bb, i, _) |
-      bb.getNode(i).getLocation().hasLocationInfo(filepath, startline, startcolumn,
-                                                            endline, endcolumn)
+  override predicate hasLocationInfo(
+    string filepath, int startline, int startcolumn, int endline, int endcolumn
+  ) {
+    exists(ReachableBasicBlock bb, int i | definesAt(bb, i, _) |
+      bb
+          .getNode(i)
+          .getLocation()
+          .hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
     )
   }
 }
@@ -633,9 +621,7 @@ abstract class SsaPseudoDefinition extends SsaImplicitDefinition {
    * Gets a textual representation of the inputs of this pseudo-definition
    * in lexicographical order.
    */
-  string ppInputs() {
-    result = concat(getAnInput().getDefinition().prettyPrintRef(), ", ")
-  }
+  string ppInputs() { result = concat(getAnInput().getDefinition().prettyPrintRef(), ", ") }
 }
 
 /**
@@ -658,13 +644,13 @@ class SsaPhiNode extends SsaPseudoDefinition, TPhi {
 
   override string getKind() { result = "phi" }
 
-  override string prettyPrintDef() {
-    result = getSourceVariable() + " = phi(" + ppInputs() + ")"
-  }
+  override string prettyPrintDef() { result = getSourceVariable() + " = phi(" + ppInputs() + ")" }
 
-  override predicate hasLocationInfo(string filepath, int startline, int startcolumn,
-                                     int endline, int endcolumn) {
-    endline = startline and endcolumn = startcolumn and
+  override predicate hasLocationInfo(
+    string filepath, int startline, int startcolumn, int endline, int endcolumn
+  ) {
+    endline = startline and
+    endcolumn = startcolumn and
     getBasicBlock().getLocation().hasLocationInfo(filepath, startline, startcolumn, _, _)
   }
 }
@@ -686,11 +672,10 @@ class SsaRefinementNode extends SsaPseudoDefinition, TRefinement {
   Refinement getRefinement() { result = getGuard().getTest() }
 
   override SsaVariable getAnInput() {
-    exists (SsaSourceVariable v, BasicBlock bb | v = getSourceVariable() and bb = getBasicBlock() |
-      if exists(SsaPhiNode phi | phi.definesAt(bb, _, v)) then
-        result.(SsaPhiNode).definesAt(bb, _, v)
-      else
-        result = getDefReachingEndOf(bb.getAPredecessor(), v)
+    exists(SsaSourceVariable v, BasicBlock bb | v = getSourceVariable() and bb = getBasicBlock() |
+      if exists(SsaPhiNode phi | phi.definesAt(bb, _, v))
+      then result.(SsaPhiNode).definesAt(bb, _, v)
+      else result = getDefReachingEndOf(bb.getAPredecessor(), v)
     )
   }
 
@@ -708,8 +693,9 @@ class SsaRefinementNode extends SsaPseudoDefinition, TRefinement {
     result = getSourceVariable() + " = refine[" + getGuard() + "](" + ppInputs() + ")"
   }
 
-  override predicate hasLocationInfo(string filepath, int startline, int startcolumn,
-                                     int endline, int endcolumn) {
+  override predicate hasLocationInfo(
+    string filepath, int startline, int startcolumn, int endline, int endcolumn
+  ) {
     getGuard().getLocation().hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
   }
 }
diff --git a/javascript/ql/src/semmle/javascript/SourceMaps.qll b/javascript/ql/src/semmle/javascript/SourceMaps.qll
index 62dbacbb1bb8..7937799ca8f0 100644
--- a/javascript/ql/src/semmle/javascript/SourceMaps.qll
+++ b/javascript/ql/src/semmle/javascript/SourceMaps.qll
@@ -10,17 +10,17 @@ class SourceMappingComment extends Comment {
   string url;
 
   SourceMappingComment() {
-    exists (string sourceMappingURLRegex |
-      sourceMappingURLRegex = "[@#]\\s*sourceMappingURL\\s*=\\s*(.*)\\s*" |
+    exists(string sourceMappingURLRegex |
+      sourceMappingURLRegex = "[@#]\\s*sourceMappingURL\\s*=\\s*(.*)\\s*"
+    |
       // either a line comment whose entire text matches the regex...
-      url = this.(SlashSlashComment).getText().regexpCapture(sourceMappingURLRegex, 1) or
+      url = this.(SlashSlashComment).getText().regexpCapture(sourceMappingURLRegex, 1)
+      or
       // ...or a block comment one of whose lines matches the regex
       url = this.(SlashStarComment).getLine(_).regexpCapture("//" + sourceMappingURLRegex, 1)
     )
   }
 
   /** Gets the URL of the source map referenced by this comment. */
-  string getSourceMappingURL() {
-    result = url
-  }
+  string getSourceMappingURL() { result = url }
 }
diff --git a/javascript/ql/src/semmle/javascript/StandardLibrary.qll b/javascript/ql/src/semmle/javascript/StandardLibrary.qll
index f2dbaa4ef19f..69d23de9932c 100644
--- a/javascript/ql/src/semmle/javascript/StandardLibrary.qll
+++ b/javascript/ql/src/semmle/javascript/StandardLibrary.qll
@@ -7,40 +7,30 @@ import javascript
  */
 class CallToObjectDefineProperty extends DataFlow::MethodCallNode {
   CallToObjectDefineProperty() {
-    exists (GlobalVariable obj |
+    exists(GlobalVariable obj |
       obj.getName() = "Object" and
       calls(DataFlow::valueNode(obj.getAnAccess()), "defineProperty")
     )
   }
 
   /** Gets the data flow node denoting the object on which the property is defined. */
-  DataFlow::Node getBaseObject() {
-    result = getArgument(0)
-  }
+  DataFlow::Node getBaseObject() { result = getArgument(0) }
 
   /** Gets the name of the property being defined, if it can be determined. */
-  string getPropertyName() {
-    result = getArgument(1).asExpr().(ConstantString).getStringValue()
-  }
+  string getPropertyName() { result = getArgument(1).asExpr().(ConstantString).getStringValue() }
 
   /** Gets the data flow node denoting the descriptor of the property being defined. */
-  DataFlow::Node getPropertyDescriptor() {
-    result = getArgument(2)
-  }
+  DataFlow::Node getPropertyDescriptor() { result = getArgument(2) }
 }
 
 /**
  * A direct call to `eval`.
  */
 class DirectEval extends CallExpr {
-  DirectEval() {
-    getCallee().(GlobalVarAccess).getName() = "eval"
-  }
+  DirectEval() { getCallee().(GlobalVarAccess).getName() = "eval" }
 
   /** Holds if this call could affect the value of `lv`. */
-  predicate mayAffect(LocalVariable lv) {
-    getParent+() = lv.getScope().getScopeElement()
-  }
+  predicate mayAffect(LocalVariable lv) { getParent+() = lv.getScope().getScopeElement() }
 }
 
 /**
@@ -48,11 +38,8 @@ class DirectEval extends CallExpr {
  *
  * A call to `JSON.parse`.
  */
-deprecated
-class JsonParseCall extends MethodCallExpr {
-  JsonParseCall() {
-    this = DataFlow::globalVarRef("JSON").getAMemberCall("parse").asExpr()
-  }
+deprecated class JsonParseCall extends MethodCallExpr {
+  JsonParseCall() { this = DataFlow::globalVarRef("JSON").getAMemberCall("parse").asExpr() }
 }
 
 /**
@@ -63,7 +50,6 @@ class JsonParseCall extends MethodCallExpr {
  * still infer the ordinary abstract value.
  */
 private class AnalyzedThisInArrayIterationFunction extends AnalyzedNode, DataFlow::ThisNode {
-
   AnalyzedNode thisSource;
 
   AnalyzedThisInArrayIterationFunction() {
@@ -72,7 +58,8 @@ private class AnalyzedThisInArrayIterationFunction extends AnalyzedNode, DataFlo
       name = "forEach" or
       name = "map" or
       name = "some" or
-      name = "every" |
+      name = "every"
+    |
       name = bindingCall.getMethodName() and
       2 = bindingCall.getNumArgument() and
       getBinder() = bindingCall.getCallback(0) and
@@ -84,7 +71,6 @@ private class AnalyzedThisInArrayIterationFunction extends AnalyzedNode, DataFlo
     result = thisSource.getALocalValue() or
     result = AnalyzedNode.super.getALocalValue()
   }
-
 }
 
 /**
@@ -95,14 +81,10 @@ abstract class PromiseDefinition extends DataFlow::DefaultSourceNode {
   abstract DataFlow::FunctionNode getExecutor();
 
   /** Gets the `resolve` parameter of the executor function. */
-  DataFlow::ParameterNode getResolveParameter() {
-    result = getExecutor().getParameter(0)
-  }
+  DataFlow::ParameterNode getResolveParameter() { result = getExecutor().getParameter(0) }
 
   /** Gets the `reject` parameter of the executor function. */
-  DataFlow::ParameterNode getRejectParameter() {
-    result = getExecutor().getParameter(1)
-  }
+  DataFlow::ParameterNode getRejectParameter() { result = getExecutor().getParameter(1) }
 
   /** Gets the `i`th callback handler installed by method `m`. */
   private DataFlow::FunctionNode getAHandler(string m, int i) {
@@ -131,16 +113,12 @@ abstract class PromiseDefinition extends DataFlow::DefaultSourceNode {
   /**
    * Gets a `catch` handler of this promise.
    */
-  DataFlow::FunctionNode getACatchHandler() {
-    result = getAHandler("catch", 0)
-  }
+  DataFlow::FunctionNode getACatchHandler() { result = getAHandler("catch", 0) }
 
   /**
    * Gets a `finally` handler of this promise.
    */
-  DataFlow::FunctionNode getAFinallyHandler() {
-    result = getAHandler("finally", 0)
-  }
+  DataFlow::FunctionNode getAFinallyHandler() { result = getAHandler("finally", 0) }
 }
 
 /** Holds if the `i`th callback handler is installed by method `m`. */
@@ -154,26 +132,20 @@ private predicate hasHandler(DataFlow::InvokeNode promise, string m, int i) {
  * For example, this could be the call `promise(f).then(function(v){...})`
  */
 class PromiseCandidate extends DataFlow::InvokeNode {
-
   PromiseCandidate() {
-    hasHandler(this, "then", [0..1]) or
+    hasHandler(this, "then", [0 .. 1]) or
     hasHandler(this, "catch", 0) or
     hasHandler(this, "finally", 0)
   }
-
 }
 
 /**
  * A promise object created by the standard ECMAScript 2015 `Promise` constructor.
  */
 private class ES2015PromiseDefinition extends PromiseDefinition, DataFlow::NewNode {
-  ES2015PromiseDefinition() {
-    this = DataFlow::globalVarRef("Promise").getAnInstantiation()
-  }
+  ES2015PromiseDefinition() { this = DataFlow::globalVarRef("Promise").getAnInstantiation() }
 
-  override DataFlow::FunctionNode getExecutor()  {
-    result = getCallback(0)
-  }
+  override DataFlow::FunctionNode getExecutor() { result = getCallback(0) }
 }
 
 /**
@@ -182,9 +154,7 @@ private class ES2015PromiseDefinition extends PromiseDefinition, DataFlow::NewNo
 private class PromiseFlowStep extends DataFlow::AdditionalFlowStep {
   PromiseDefinition p;
 
-  PromiseFlowStep() {
-    this = p
-  }
+  PromiseFlowStep() { this = p }
 
   override predicate step(DataFlow::Node pred, DataFlow::Node succ) {
     pred = p.getResolveParameter().getACall().getArgument(0) and
@@ -206,8 +176,9 @@ private predicate promiseTaintStep(DataFlow::Node pred, DataFlow::Node succ) {
   succ = DataFlow::globalVarRef("Promise").getAMemberCall("resolve") and
   pred = succ.(DataFlow::CallNode).getArgument(0)
   or
-  exists (DataFlow::MethodCallNode thn, DataFlow::FunctionNode cb |
-    thn.getMethodName() = "then" and cb = thn.getCallback(0) |
+  exists(DataFlow::MethodCallNode thn, DataFlow::FunctionNode cb |
+    thn.getMethodName() = "then" and cb = thn.getCallback(0)
+  |
     // from `p` to `x` in `p.then(x => ...)`
     pred = thn.getReceiver() and
     succ = cb.getParameter(0)
@@ -224,11 +195,9 @@ private predicate promiseTaintStep(DataFlow::Node pred, DataFlow::Node succ) {
 private class PromiseTaintStep extends TaintTracking::AdditionalTaintStep {
   DataFlow::Node source;
 
-  PromiseTaintStep() {
-    promiseTaintStep(source, this)
-  }
+  PromiseTaintStep() { promiseTaintStep(source, this) }
 
   override predicate step(DataFlow::Node pred, DataFlow::Node succ) {
     pred = source and succ = this
   }
-}
\ No newline at end of file
+}
diff --git a/javascript/ql/src/semmle/javascript/Stmt.qll b/javascript/ql/src/semmle/javascript/Stmt.qll
index e076011ee441..40fea08c4199 100644
--- a/javascript/ql/src/semmle/javascript/Stmt.qll
+++ b/javascript/ql/src/semmle/javascript/Stmt.qll
@@ -5,9 +5,7 @@ import javascript
 /** A statement. */
 class Stmt extends @stmt, ExprOrStmt, Documentable {
   /** Gets the statement container (toplevel, function or namespace) to which this statement belongs. */
-  override StmtContainer getContainer() {
-    stmtContainers(this, result)
-  }
+  override StmtContainer getContainer() { stmtContainers(this, result) }
 
   /** Holds if this statement has an implicitly inserted semicolon. */
   predicate hasSemicolonInserted() {
@@ -16,9 +14,7 @@ class Stmt extends @stmt, ExprOrStmt, Documentable {
   }
 
   /** Holds if automatic semicolon insertion applies to this statement. */
-  predicate isSubjectToSemicolonInsertion() {
-    none()
-  }
+  predicate isSubjectToSemicolonInsertion() { none() }
 
   /**
    * Gets the kind of this statement, which is an integer
@@ -27,20 +23,14 @@ class Stmt extends @stmt, ExprOrStmt, Documentable {
    * _Note_: The mapping from node types to integers is considered an implementation detail
    * and may change between versions of the extractor.
    */
-  int getKind() {
-    stmts(this, result, _, _, _)
-  }
+  int getKind() { stmts(this, result, _, _, _) }
 
-  override string toString() {
-    stmts(this, _, _, _, result)
-  }
+  override string toString() { stmts(this, _, _, _, result) }
 
   /**
    * Gets the statement that is the parent of this statement in the AST, if any.
    */
-  Stmt getParentStmt() {
-    this = result.getAChildStmt()
-  }
+  Stmt getParentStmt() { this = result.getAChildStmt() }
 
   /**
    * Holds if this statement is lexically nested inside statement `outer`.
@@ -50,9 +40,7 @@ class Stmt extends @stmt, ExprOrStmt, Documentable {
     getContainer().(Expr).getEnclosingStmt().nestedIn(outer)
   }
 
-  override predicate isAmbient() {
-    hasDeclareKeyword(this) or getParent().isAmbient()
-  }
+  override predicate isAmbient() { hasDeclareKeyword(this) or getParent().isAmbient() }
 }
 
 /**
@@ -72,47 +60,33 @@ abstract class LoopStmt extends ControlStmt {
   /** Gets the loop test of this loop. */
   abstract Expr getTest();
 
-  override Stmt getAControlledStmt() {
-    result = getBody()
-  }
+  override Stmt getAControlledStmt() { result = getBody() }
 }
 
 /** An empty statement. */
-class EmptyStmt extends @emptystmt, Stmt {}
+class EmptyStmt extends @emptystmt, Stmt { }
 
 /** A block of statements. */
 class BlockStmt extends @blockstmt, Stmt {
   /** Gets the `i`th statement in this block. */
-  Stmt getStmt(int i) {
-    result = getChildStmt(i)
-  }
+  Stmt getStmt(int i) { result = getChildStmt(i) }
 
   /** Gets a statement in this block. */
-  Stmt getAStmt() {
-    result = getStmt(_)
-  }
+  Stmt getAStmt() { result = getStmt(_) }
 
   /** Gets the number of statements in this block. */
-  int getNumStmt() {
-    result = count(getAStmt())
-  }
+  int getNumStmt() { result = count(getAStmt()) }
 
   /** Holds if this block is a function body. */
-  predicate isFunctionBody() {
-    this.getParent() instanceof Function
-  }
+  predicate isFunctionBody() { this.getParent() instanceof Function }
 }
 
 /** An expression statement. */
 class ExprStmt extends @exprstmt, Stmt {
   /** Gets the expression of this expression statement. */
-  Expr getExpr() {
-    result = getChildExpr(0)
-  }
+  Expr getExpr() { result = getChildExpr(0) }
 
-  override predicate isSubjectToSemicolonInsertion() {
-    not isDoubleColonMethod(_, _, _)
-  }
+  override predicate isSubjectToSemicolonInsertion() { not isDoubleColonMethod(_, _, _) }
 
   /**
    * Holds if this expression statement is a JScript-style double colon method declaration.
@@ -120,14 +94,17 @@ class ExprStmt extends @exprstmt, Stmt {
   predicate isDoubleColonMethod(Identifier interface, Identifier id, Function f) {
     // the parser converts double colon method declarations into assignments, but we
     // can consult token-level information to identify them
-    exists (Assignment assgn, DotExpr dot, Token tk |
+    exists(Assignment assgn, DotExpr dot, Token tk |
       assgn = getExpr() and
       dot = assgn.getLhs() and
       interface = dot.getBase() and
       // check if the interface name is followed by two colons
       tk = interface.getLastToken().getNextToken() and
-      (tk.getValue() = ":" and  tk.getNextToken().getValue() = ":" or
-       tk.getValue() = "::") and
+      (
+        tk.getValue() = ":" and tk.getNextToken().getValue() = ":"
+        or
+        tk.getValue() = "::"
+      ) and
       id = dot.getProperty() and
       f = assgn.getRhs()
     )
@@ -139,9 +116,7 @@ class ExprStmt extends @exprstmt, Stmt {
  * be a directive).
  */
 private class MaybeDirective extends ExprStmt {
-  MaybeDirective() {
-    getExpr() instanceof StringLiteral
-  }
+  MaybeDirective() { getExpr() instanceof StringLiteral }
 
   /**
    * Gets the raw text of the string literal wrapped by this statement.
@@ -164,8 +139,8 @@ private class MaybeDirective extends ExprStmt {
    * string literal is the same as in the former case.)
    */
   string getDirectiveText() {
-    exists (string text | text = getExpr().(StringLiteral).getRawValue() |
-      result = text.substring(1, text.length()-1)
+    exists(string text | text = getExpr().(StringLiteral).getRawValue() |
+      result = text.substring(1, text.length() - 1)
     )
   }
 }
@@ -173,19 +148,18 @@ private class MaybeDirective extends ExprStmt {
 /** A directive: string literal expression statement in the beginning of a statement container. */
 class Directive extends MaybeDirective {
   Directive() {
-    exists (StmtContainer sc, ASTNode body, int i |
+    exists(StmtContainer sc, ASTNode body, int i |
       // directives must be toplevel statements in their container
-      body = sc.getBody() and this = body.getChildStmt(i) and
+      body = sc.getBody() and
+      this = body.getChildStmt(i) and
       // and all preceding statements must be directives as well
-      forall (Stmt pred | pred = body.getChildStmt([0..i-1]) | pred instanceof MaybeDirective)
+      forall(Stmt pred | pred = body.getChildStmt([0 .. i - 1]) | pred instanceof MaybeDirective)
     )
   }
 }
 
 /** A known directive, such as a strict mode declaration. */
-abstract class KnownDirective extends Directive {
-
-}
+abstract class KnownDirective extends Directive { }
 
 /** A strict mode declaration. */
 class StrictModeDecl extends KnownDirective {
@@ -193,9 +167,7 @@ class StrictModeDecl extends KnownDirective {
 }
 
 /** An asm.js directive. */
-class ASMJSDirective extends KnownDirective {
-  ASMJSDirective() { getDirectiveText() = "use asm" }
-}
+class ASMJSDirective extends KnownDirective { ASMJSDirective() { getDirectiveText() = "use asm" } }
 
 /** A Babel directive. */
 class BabelDirective extends KnownDirective {
@@ -209,9 +181,7 @@ class SixToFiveDirective extends KnownDirective {
 
 /** A SystemJS `format` directive. */
 class SystemJSFormatDirective extends KnownDirective {
-  SystemJSFormatDirective() {
-    getDirectiveText().regexpMatch("format (cjs|esm|global|register)")
-  }
+  SystemJSFormatDirective() { getDirectiveText().regexpMatch("format (cjs|esm|global|register)") }
 }
 
 /** A SystemJS `format register` directive. */
@@ -226,44 +196,30 @@ class NgInjectDirective extends KnownDirective {
 
 /** A YUI compressor directive. */
 class YuiDirective extends KnownDirective {
-  YuiDirective() {
-    getDirectiveText().regexpMatch("([a-z0-9_]+:nomunge, ?)*([a-z0-9_]+:nomunge)")
-  }
+  YuiDirective() { getDirectiveText().regexpMatch("([a-z0-9_]+:nomunge, ?)*([a-z0-9_]+:nomunge)") }
 }
 
 /** A SystemJS `deps` directive. */
 class SystemJSDepsDirective extends KnownDirective {
-  SystemJSDepsDirective() {
-    getDirectiveText().regexpMatch("deps [^ ]+")
-  }
+  SystemJSDepsDirective() { getDirectiveText().regexpMatch("deps [^ ]+") }
 }
 
 /** A `bundle` directive. */
-class BundleDirective extends KnownDirective {
-  BundleDirective() { getDirectiveText() = "bundle" }
-}
+class BundleDirective extends KnownDirective { BundleDirective() { getDirectiveText() = "bundle" } }
 
 /** An `if` statement. */
 class IfStmt extends @ifstmt, ControlStmt {
   /** Gets the condition of this `if` statement. */
-  Expr getCondition() {
-    result = getChildExpr(0)
-  }
+  Expr getCondition() { result = getChildExpr(0) }
 
   /** Gets the "then" branch of this `if` statement. */
-  Stmt getThen() {
-    result = getChildStmt(1)
-  }
+  Stmt getThen() { result = getChildStmt(1) }
 
   /** Gets the "else" branch of this `if` statement, if any. */
-  Stmt getElse() {
-    result = getChildStmt(2)
-  }
+  Stmt getElse() { result = getChildStmt(2) }
 
   /** Gets the `if` token of this `if` statement. */
-  KeywordToken getIfToken() {
-    result = getFirstToken()
-  }
+  KeywordToken getIfToken() { result = getFirstToken() }
 
   /** Gets the `else` token of this `if` statement, if any. */
   KeywordToken getElseToken() {
@@ -277,22 +233,16 @@ class IfStmt extends @ifstmt, ControlStmt {
   }
 
   /** Holds if this `if` statement is an `else if` of an outer `if` statement. */
-  predicate isElseIf() {
-    exists(IfStmt outer | outer.getElse() = this)
-  }
+  predicate isElseIf() { exists(IfStmt outer | outer.getElse() = this) }
 }
 
 /** A labeled statement. */
 class LabeledStmt extends @labeledstmt, Stmt {
   /** Gets the label of this statement. */
-  string getLabel() {
-    result = getChildExpr(0).(Identifier).getName()
-  }
+  string getLabel() { result = getChildExpr(0).(Identifier).getName() }
 
   /** Gets the labeled statement of this statement. */
-  Stmt getStmt() {
-    result = getChildStmt(1)
-  }
+  Stmt getStmt() { result = getChildStmt(1) }
 }
 
 /**
@@ -320,42 +270,30 @@ abstract class JumpStmt extends Stmt {
 /** A break or continue statement. */
 abstract class BreakOrContinueStmt extends JumpStmt {
   /** Gets the label this statement refers to, if any. */
-  string getTargetLabel() {
-    result = ((Identifier)getChildExpr(0)).getName()
-  }
+  string getTargetLabel() { result = (getChildExpr(0).(Identifier)).getName() }
 
   /** Holds if this statement has an explicit target label. */
-  predicate hasTargetLabel() {
-    exists(getTargetLabel())
-  }
+  predicate hasTargetLabel() { exists(getTargetLabel()) }
 
   /** Gets the statement this statement breaks out of or continues with. */
-  override Stmt getTarget() {
-    jumpTargets(this, result)
-  }
+  override Stmt getTarget() { jumpTargets(this, result) }
 
-  override predicate isSubjectToSemicolonInsertion() {
-    any()
-  }
+  override predicate isSubjectToSemicolonInsertion() { any() }
 }
 
 /** A `break` statement. */
-class BreakStmt extends @breakstmt, BreakOrContinueStmt {}
+class BreakStmt extends @breakstmt, BreakOrContinueStmt { }
 
 /** A `continue` statement. */
-class ContinueStmt extends @continuestmt, BreakOrContinueStmt {}
+class ContinueStmt extends @continuestmt, BreakOrContinueStmt { }
 
 /** A `with` statement. */
 class WithStmt extends @withstmt, ControlStmt {
   /** Gets the controlling expression of this `with` statement. */
-  Expr getExpr() {
-    result = getChildExpr(0)
-  }
+  Expr getExpr() { result = getChildExpr(0) }
 
   /** Gets the body of this `with` statement. */
-  Stmt getBody() {
-    result = getChildStmt(1)
-  }
+  Stmt getBody() { result = getChildStmt(1) }
 
   /**
    * Holds if `acc` could refer to a property of the scope object
@@ -363,76 +301,52 @@ class WithStmt extends @withstmt, ControlStmt {
    */
   predicate mayAffect(VarAccess acc) {
     acc.getEnclosingStmt().nestedIn(getBody()) and
-    exists (Variable v | v = acc.getVariable() |
-      v instanceof GlobalVariable or
-      exists (ASTNode scopeElt | scopeElt = v.getScope().getScopeElement() |
-        scopeElt = getParent+()
-      )
+    exists(Variable v | v = acc.getVariable() |
+      v instanceof GlobalVariable
+      or
+      exists(ASTNode scopeElt | scopeElt = v.getScope().getScopeElement() | scopeElt = getParent+())
     )
   }
 
-  override Stmt getAControlledStmt() {
-    result = getBody()
-  }
+  override Stmt getAControlledStmt() { result = getBody() }
 }
 
 /** A `switch` statement. */
 class SwitchStmt extends @switchstmt, ControlStmt {
   /** Gets the controlling expression of this `switch` statement. */
-  Expr getExpr() {
-    result = getChildExpr(-1)
-  }
+  Expr getExpr() { result = getChildExpr(-1) }
 
   /** Gets the `i`th `case` clause of this `switch` statement. */
-  Case getCase(int i) {
-    result = getChildStmt(i)
-  }
+  Case getCase(int i) { result = getChildStmt(i) }
 
   /** Gets a `case` clause of this `switch` statement. */
-  Case getACase() {
-    result = getCase(_)
-  }
+  Case getACase() { result = getCase(_) }
 
   /** Gets the number of `case` clauses of this `switch` statement. */
-  int getNumCase() {
-    result = count(getACase())
-  }
+  int getNumCase() { result = count(getACase()) }
 
-  override Case getAControlledStmt() {
-    result = getACase()
-  }
+  override Case getAControlledStmt() { result = getACase() }
 }
 
 /** A `return` statement. */
 class ReturnStmt extends @returnstmt, JumpStmt {
   /** Gets the expression specifying the returned value, if any. */
-  Expr getExpr() {
-    result = getChildExpr(0)
-  }
+  Expr getExpr() { result = getChildExpr(0) }
 
   /** Gets the target of this `return` statement, which is the enclosing statement container. */
-  override Function getTarget() {
-    result = getContainer()
-  }
+  override Function getTarget() { result = getContainer() }
 
   override ControlFlowNode getFirstControlFlowNode() {
-    if exists(getExpr()) then
-      result = getExpr().getFirstControlFlowNode()
-    else
-      result = this
+    if exists(getExpr()) then result = getExpr().getFirstControlFlowNode() else result = this
   }
 
-  override predicate isSubjectToSemicolonInsertion() {
-    any()
-  }
+  override predicate isSubjectToSemicolonInsertion() { any() }
 }
 
 /** A `throw` statement. */
 class ThrowStmt extends @throwstmt, JumpStmt {
   /** Gets the expression specifying the value to throw. */
-  Expr getExpr() {
-    result = getChildExpr(0)
-  }
+  Expr getExpr() { result = getChildExpr(0) }
 
   /**
    * Gets the target of this `throw` statement, which is the closest surrounding
@@ -440,28 +354,24 @@ class ThrowStmt extends @throwstmt, JumpStmt {
    * `try` statement, the target defaults to the enclosing statement container.
    */
   override ASTNode getTarget() {
-    if exists (TryStmt ts | getParentStmt+() = ts.getBody()) then
-      (getParentStmt+() = ((TryStmt)result).getBody() and
-       not exists (TryStmt mid | getParentStmt+() = mid.getBody() and mid.getParentStmt+() = result))
-    else
-      result = getContainer()
+    if exists(TryStmt ts | getParentStmt+() = ts.getBody())
+    then (
+      getParentStmt+() = (result.(TryStmt)).getBody() and
+      not exists(TryStmt mid | getParentStmt+() = mid.getBody() and mid.getParentStmt+() = result)
+    ) else result = getContainer()
   }
 
   override ControlFlowNode getFirstControlFlowNode() {
     result = getExpr().getFirstControlFlowNode()
   }
 
-  override predicate isSubjectToSemicolonInsertion() {
-    any()
-  }
+  override predicate isSubjectToSemicolonInsertion() { any() }
 }
 
 /** A `try` statement. */
 class TryStmt extends @trystmt, ControlStmt {
   /** Gets the body of this `try` statement. */
-  BlockStmt getBody() {
-    result = getChildStmt(0)
-  }
+  BlockStmt getBody() { result = getChildStmt(0) }
 
   override Stmt getAControlledStmt() {
     result = getBody() or
@@ -471,17 +381,15 @@ class TryStmt extends @trystmt, ControlStmt {
 
   /** Gets the `i`th `catch` clause of this `try` statement, if any. */
   CatchClause getCatchClause(int i) {
-    exists (int idx |
+    exists(int idx |
       result = getChildStmt(idx) and
       idx >= 1 and
-      i = idx-1
+      i = idx - 1
     )
   }
 
   /** Gets a `catch` clause of this `try` statement. */
-  CatchClause getACatchClause() {
-    result = getCatchClause(_)
-  }
+  CatchClause getACatchClause() { result = getCatchClause(_) }
 
   /** Gets the (unique) unguarded `catch` clause of this `try` statement, if any. */
   CatchClause getCatchClause() {
@@ -490,50 +398,32 @@ class TryStmt extends @trystmt, ControlStmt {
   }
 
   /** Gets the number of `catch` clauses of this `try` statement. */
-  int getNumCatchClause() {
-    result = count(getACatchClause())
-  }
+  int getNumCatchClause() { result = count(getACatchClause()) }
 
   /** Gets the `finally` block of this `try` statement, if any. */
-  BlockStmt getFinally() {
-    result = getChildStmt(-1)
-  }
+  BlockStmt getFinally() { result = getChildStmt(-1) }
 }
 
 /** A `while` loop. */
 class WhileStmt extends @whilestmt, LoopStmt {
   /** Gets the loop condition of this `while` loop. */
-  Expr getExpr() {
-    result = getChildExpr(0)
-  }
+  Expr getExpr() { result = getChildExpr(0) }
 
-  override Expr getTest() {
-    result = getExpr()
-  }
+  override Expr getTest() { result = getExpr() }
 
-  override Stmt getBody() {
-    result = getChildStmt(1)
-  }
+  override Stmt getBody() { result = getChildStmt(1) }
 }
 
 /** A `do`-`while` loop. */
 class DoWhileStmt extends @dowhilestmt, LoopStmt {
   /** Gets the loop condition of this `do`-`while` loop. */
-  Expr getExpr() {
-    result = getChildExpr(1)
-  }
+  Expr getExpr() { result = getChildExpr(1) }
 
-  override Expr getTest() {
-    result = getExpr()
-  }
+  override Expr getTest() { result = getExpr() }
 
-  override Stmt getBody() {
-    result = getChildStmt(0)
-  }
+  override Stmt getBody() { result = getChildStmt(0) }
 
-  override predicate isSubjectToSemicolonInsertion() {
-    any()
-  }
+  override predicate isSubjectToSemicolonInsertion() { any() }
 }
 
 /** An expression or a variable declaration statement. */
@@ -552,18 +442,12 @@ class ForStmt extends @forstmt, LoopStmt {
     result = getChildStmt(0)
   }
 
-  override Expr getTest() {
-    result = getChildExpr(1)
-  }
+  override Expr getTest() { result = getChildExpr(1) }
 
   /** Gets the update part of this `for` loop. */
-  Expr getUpdate() {
-    result = getChildExpr(2)
-  }
+  Expr getUpdate() { result = getChildExpr(2) }
 
-  override Stmt getBody() {
-    result = getChildStmt(3)
-  }
+  override Stmt getBody() { result = getChildStmt(3) }
 }
 
 /** A `for`-`in` or `for`-`of` loop. */
@@ -580,9 +464,7 @@ abstract class EnhancedForLoop extends LoopStmt {
   /**
    * Gets the default value of the loop's iterator, if any.
    */
-  Expr getDefault() {
-    result = getChildExpr(-1)
-  }
+  Expr getDefault() { result = getChildExpr(-1) }
 
   /**
    * Gets the iterator expression of this `for`-`in` or `for`-`of` loop; this can be
@@ -601,18 +483,12 @@ abstract class EnhancedForLoop extends LoopStmt {
     result = getIterator().(BindingPattern).getAVariable()
   }
 
-  override Expr getTest() {
-    none()
-  }
+  override Expr getTest() { none() }
 
   /** Gets the expression this `for`-`in` or `for`-`of` loop iterates over. */
-  Expr getIterationDomain() {
-    result = getChildExpr(1)
-  }
+  Expr getIterationDomain() { result = getChildExpr(1) }
 
-  override Stmt getBody() {
-    result = getChildStmt(2)
-  }
+  override Stmt getBody() { result = getChildStmt(2) }
 
   override ControlFlowNode getFirstControlFlowNode() {
     result = getIteratorExpr().getFirstControlFlowNode()
@@ -620,72 +496,58 @@ abstract class EnhancedForLoop extends LoopStmt {
 }
 
 /** A `for`-`in` loop. */
-class ForInStmt extends @forinstmt, EnhancedForLoop {}
+class ForInStmt extends @forinstmt, EnhancedForLoop { }
 
 /** A `for`-`of` loop. */
 class ForOfStmt extends @forofstmt, EnhancedForLoop {
   /**
    * Holds if this is a `for-await-of` statement.
    */
-  predicate isAwait() {
-    isForAwaitOf(this)
-  }
+  predicate isAwait() { isForAwaitOf(this) }
 }
 
 /** A `for each`-`in` loop. */
-class ForEachStmt extends @foreachstmt, EnhancedForLoop {}
+class ForEachStmt extends @foreachstmt, EnhancedForLoop { }
 
 /** A `debugger` statement. */
 class DebuggerStmt extends @debuggerstmt, Stmt {
-  override predicate isSubjectToSemicolonInsertion() {
-    any()
-  }
+  override predicate isSubjectToSemicolonInsertion() { any() }
 }
 
 /** A function declaration statement. */
 class FunctionDeclStmt extends @functiondeclstmt, Stmt, Function {
-  override Stmt getEnclosingStmt() {
-    result = this
-  }
+  override Stmt getEnclosingStmt() { result = this }
 
-  override predicate isAmbient() {
-    Function.super.isAmbient()
-  }
+  override predicate isAmbient() { Function.super.isAmbient() }
 }
 
 /** A declaration statement, that is, a `var`, `const` or `let` declaration. */
 class DeclStmt extends @declstmt, Stmt {
   /** Gets the `i`th declarator in this declaration statement. */
-  VariableDeclarator getDecl(int i) {
-    result = getChildExpr(i) and i >= 0
-  }
+  VariableDeclarator getDecl(int i) { result = getChildExpr(i) and i >= 0 }
 
   /** Gets a declarator in this declaration statement. */
-  VariableDeclarator getADecl() {
-    result = getDecl(_)
-  }
+  VariableDeclarator getADecl() { result = getDecl(_) }
 
   override predicate isSubjectToSemicolonInsertion() {
     // exclude variable declarations in the init part of for/for-in/for-of loops
-    not exists (LoopStmt for | this = for.getAChildStmt() and this != for.getBody())
+    not exists(LoopStmt for | this = for.getAChildStmt() and this != for.getBody())
   }
 }
 
 /** A `var` declaration statement. */
-class VarDeclStmt extends @vardeclstmt, DeclStmt {}
+class VarDeclStmt extends @vardeclstmt, DeclStmt { }
 
 /** A `const` declaration statement. */
-class ConstDeclStmt extends @constdeclstmt, DeclStmt {}
+class ConstDeclStmt extends @constdeclstmt, DeclStmt { }
 
 /** A `let` declaration statement. */
-class LetStmt extends @letstmt, DeclStmt {}
+class LetStmt extends @letstmt, DeclStmt { }
 
 /** A legacy `let` statement, that is, a statement of the form `let(vardecls) stmt`. */
 class LegacyLetStmt extends @legacy_letstmt, DeclStmt {
   /** Gets the statement this let statement scopes over. */
-  Stmt getBody() {
-    result = getChildStmt(-1)
-  }
+  Stmt getBody() { result = getChildStmt(-1) }
 
   override predicate isSubjectToSemicolonInsertion() { none() }
 }
@@ -693,54 +555,34 @@ class LegacyLetStmt extends @legacy_letstmt, DeclStmt {
 /** A `case` or `default` clause in a `switch` statement. */
 class Case extends @case, Stmt {
   /** Gets the test expression of this `case` clause. */
-  Expr getExpr() {
-    result = getChildExpr(-1)
-  }
+  Expr getExpr() { result = getChildExpr(-1) }
 
   /** Holds if this is a `default` clause. */
-  predicate isDefault() {
-    not exists(getExpr())
-  }
+  predicate isDefault() { not exists(getExpr()) }
 
   /** Gets the `i`th statement in this `case` clause. */
-  Stmt getBodyStmt(int i) {
-    result = getChildStmt(i)
-  }
+  Stmt getBodyStmt(int i) { result = getChildStmt(i) }
 
   /** Gets a statement in this `case` clause. */
-  Stmt getABodyStmt() {
-    result = getChildStmt(_)
-  }
+  Stmt getABodyStmt() { result = getChildStmt(_) }
 
   /** Gets the number of statements in this `case` clause. */
-  int getNumBodyStmt() {
-    result = count(getABodyStmt())
-  }
+  int getNumBodyStmt() { result = count(getABodyStmt()) }
 
   /** Gets the `switch` statement to which this clause belongs. */
-  SwitchStmt getSwitch() {
-    result = getParent()
-  }
+  SwitchStmt getSwitch() { result = getParent() }
 }
 
 /** A `catch` clause. */
 class CatchClause extends @catchclause, ControlStmt, Parameterized {
   /** Gets the body of this `catch` clause. */
-  BlockStmt getBody() {
-    result = getChildStmt(1)
-  }
+  BlockStmt getBody() { result = getChildStmt(1) }
 
   /** Gets the guard expression of this `catch` clause, if any. */
-  Expr getGuard() {
-    result = getChildExpr(2)
-  }
+  Expr getGuard() { result = getChildExpr(2) }
 
-  override Stmt getAControlledStmt() {
-    result = getBody()
-  }
+  override Stmt getAControlledStmt() { result = getBody() }
 
   /** Gets the scope induced by this `catch` clause. */
-  CatchScope getScope() {
-    result.getCatchClause() = this
-  }
+  CatchScope getScope() { result.getCatchClause() = this }
 }
diff --git a/javascript/ql/src/semmle/javascript/StringConcatenation.qll b/javascript/ql/src/semmle/javascript/StringConcatenation.qll
index 50e06860bd06..30f00a536300 100644
--- a/javascript/ql/src/semmle/javascript/StringConcatenation.qll
+++ b/javascript/ql/src/semmle/javascript/StringConcatenation.qll
@@ -1,6 +1,7 @@
 /**
  * Provides predicates for analyzing string concatenations and their operands.
  */
+
 import javascript
 
 module StringConcatenation {
@@ -8,27 +9,31 @@ module StringConcatenation {
   private DataFlow::Node getAssignAddResult(AssignAddExpr expr) {
     result = expr.flow()
     or
-    exists (SsaExplicitDefinition def | def.getDef() = expr |
-      result = DataFlow::valueNode(def.getVariable().getAUse()))
+    exists(SsaExplicitDefinition def | def.getDef() = expr |
+      result = DataFlow::valueNode(def.getVariable().getAUse())
+    )
   }
 
   /** Gets the `n`th operand to the string concatenation defining `node`. */
   DataFlow::Node getOperand(DataFlow::Node node, int n) {
-    exists (AddExpr add | node = add.flow() |
+    exists(AddExpr add | node = add.flow() |
       n = 0 and result = add.getLeftOperand().flow()
       or
-      n = 1 and result = add.getRightOperand().flow())
+      n = 1 and result = add.getRightOperand().flow()
+    )
     or
-    exists (TemplateLiteral template | node = template.flow() |
+    exists(TemplateLiteral template | node = template.flow() |
       result = template.getElement(n).flow() and
-      not exists (TaggedTemplateExpr tag | template = tag.getTemplate()))
+      not exists(TaggedTemplateExpr tag | template = tag.getTemplate())
+    )
     or
-    exists (AssignAddExpr assign | node = getAssignAddResult(assign) |
+    exists(AssignAddExpr assign | node = getAssignAddResult(assign) |
       n = 0 and result = assign.getLhs().flow()
       or
-      n = 1 and result = assign.getRhs().flow())
+      n = 1 and result = assign.getRhs().flow()
+    )
     or
-    exists (DataFlow::ArrayCreationNode array, DataFlow::MethodCallNode call |
+    exists(DataFlow::ArrayCreationNode array, DataFlow::MethodCallNode call |
       call = array.getAMethodCall("join") and
       call.getArgument(0).mayHaveStringValue("") and
       (
@@ -40,29 +45,24 @@ module StringConcatenation {
         node = call and
         result = array and
         n = 0
-      ))
+      )
+    )
   }
 
   /** Gets an operand to the string concatenation defining `node`. */
-  DataFlow::Node getAnOperand(DataFlow::Node node) {
-    result = getOperand(node, _)
-  }
+  DataFlow::Node getAnOperand(DataFlow::Node node) { result = getOperand(node, _) }
 
   /** Gets the number of operands to the given concatenation. */
-  int getNumOperand(DataFlow::Node node) {
-    result = strictcount(getAnOperand(node))
-  }
+  int getNumOperand(DataFlow::Node node) { result = strictcount(getAnOperand(node)) }
 
   /** Gets the first operand to the string concatenation defining `node`. */
-  DataFlow::Node getFirstOperand(DataFlow::Node node) {
-    result = getOperand(node, 0)
-  }
+  DataFlow::Node getFirstOperand(DataFlow::Node node) { result = getOperand(node, 0) }
 
   /** Gets the last operand to the string concatenation defining `node`. */
   DataFlow::Node getLastOperand(DataFlow::Node node) {
     result = getOperand(node, getNumOperand(node) - 1)
   }
-  
+
   /**
    * Holds if `src` flows to `dst` through the `n`th operand of the given concatenation operator.
    */
@@ -74,7 +74,5 @@ module StringConcatenation {
   /**
    * Holds if there is a taint step from `src` to `dst` through string concatenation.
    */
-  predicate taintStep(DataFlow::Node src, DataFlow::Node dst) {
-    taintStep(src, dst, _, _)
-  }
+  predicate taintStep(DataFlow::Node src, DataFlow::Node dst) { taintStep(src, dst, _, _) }
 }
diff --git a/javascript/ql/src/semmle/javascript/Templates.qll b/javascript/ql/src/semmle/javascript/Templates.qll
index 26417e874389..b410fe13d57e 100644
--- a/javascript/ql/src/semmle/javascript/Templates.qll
+++ b/javascript/ql/src/semmle/javascript/Templates.qll
@@ -5,14 +5,10 @@ import javascript
 /** A tagged template literal expression. */
 class TaggedTemplateExpr extends Expr, @taggedtemplateexpr {
   /** Gets the tagging expression of this tagged template. */
-  Expr getTag() {
-    result = getChildExpr(0)
-  }
+  Expr getTag() { result = getChildExpr(0) }
 
   /** Gets the tagged template itself. */
-  TemplateLiteral getTemplate() {
-    result = getChildExpr(1)
-  }
+  TemplateLiteral getTemplate() { result = getChildExpr(1) }
 
   override predicate isImpure() { any() }
 }
@@ -23,16 +19,12 @@ class TemplateLiteral extends Expr, @templateliteral {
    * Gets the `i`th element of this template literal, which may either
    * be an interpolated expression or a constant template element.
    */
-  Expr getElement(int i) {
-    result = getChildExpr(i)
-  }
+  Expr getElement(int i) { result = getChildExpr(i) }
 
   /**
    * Gets an element of this template literal.
    */
-  Expr getAnElement() {
-    result = getElement(_)
-  }
+  Expr getAnElement() { result = getElement(_) }
 
   override predicate isImpure() { getAnElement().isImpure() }
 
@@ -55,9 +47,7 @@ class TemplateElement extends Expr, @templateelement {
    * elements with invalid escape sequences, which only have a raw value but
    * no cooked value.
    */
-  predicate hasValue() {
-    exists(getValue())
-  }
+  predicate hasValue() { exists(getValue()) }
 
   /**
    * Gets the "cooked" value of this template element, if any.
@@ -72,9 +62,7 @@ class TemplateElement extends Expr, @templateelement {
   }
 
   /** Gets the raw value of this template element. */
-  string getRawValue() {
-    literals(_, result, this)
-  }
+  string getRawValue() { literals(_, result, this) }
 
   override predicate isImpure() { none() }
 
diff --git a/javascript/ql/src/semmle/javascript/Tokens.qll b/javascript/ql/src/semmle/javascript/Tokens.qll
index b5370d44ecb8..8f5ac9d6a581 100644
--- a/javascript/ql/src/semmle/javascript/Tokens.qll
+++ b/javascript/ql/src/semmle/javascript/Tokens.qll
@@ -6,24 +6,16 @@ import javascript
 
 /** A token occurring in a piece of JavaScript source code. */
 class Token extends Locatable, @token {
-  override Location getLocation() {
-    hasLocation(this, result)
-  }
+  override Location getLocation() { hasLocation(this, result) }
 
   /** Gets the toplevel syntactic structure to which this token belongs. */
-  TopLevel getTopLevel() {
-    tokeninfo(this, _, result, _, _)
-  }
+  TopLevel getTopLevel() { tokeninfo(this, _, result, _, _) }
 
   /** Gets the index of the token inside its toplevel structure. */
-  int getIndex() {
-    tokeninfo(this, _, _, result, _)
-  }
+  int getIndex() { tokeninfo(this, _, _, result, _) }
 
   /** Gets the source text of this token. */
-  string getValue() {
-    tokeninfo(this, _, _, _, result)
-  }
+  string getValue() { tokeninfo(this, _, _, _, result) }
 
   /** Gets the token following this token inside the same toplevel structure, if any. */
   Token getNextToken() {
@@ -32,38 +24,34 @@ class Token extends Locatable, @token {
   }
 
   /** Gets the token preceding this token inside the same toplevel structure, if any. */
-  Token getPreviousToken() {
-    result.getNextToken() = this
-  }
+  Token getPreviousToken() { result.getNextToken() = this }
 
-  override string toString() {
-    result = getValue()
-  }
+  override string toString() { result = getValue() }
 }
 
 /** An end-of-file token. */
-class EOFToken extends Token, @token_eof {}
+class EOFToken extends Token, @token_eof { }
 
 /** A null literal token. */
-class NullLiteralToken extends Token, @token_null_literal {}
+class NullLiteralToken extends Token, @token_null_literal { }
 
 /** A Boolean literal token, that is, `true` or `false`. */
-class BooleanLiteralToken extends Token, @token_boolean_literal {}
+class BooleanLiteralToken extends Token, @token_boolean_literal { }
 
 /** A numeric literal token such as `1` or `2.3`. */
-class NumericLiteralToken extends Token, @token_numeric_literal {}
+class NumericLiteralToken extends Token, @token_numeric_literal { }
 
 /** A string literal token such as `"hello"` or `'world!'`. */
-class StringLiteralToken extends Token, @token_string_literal {}
+class StringLiteralToken extends Token, @token_string_literal { }
 
 /** A regular expression literal token such as `/\w+/`. */
-class RegularExpressionToken extends Token, @token_regular_expression {}
+class RegularExpressionToken extends Token, @token_regular_expression { }
 
 /** An identifier token such as `name`. */
-class IdentifierToken extends Token, @token_identifier {}
+class IdentifierToken extends Token, @token_identifier { }
 
 /** A keyword token such as `function` or `this`. */
-class KeywordToken extends Token, @token_keyword {}
+class KeywordToken extends Token, @token_keyword { }
 
 /** A punctuator token such as `;` or `+`. */
-class PunctuatorToken extends Token, @token_punctuator {}
\ No newline at end of file
+class PunctuatorToken extends Token, @token_punctuator { }
diff --git a/javascript/ql/src/semmle/javascript/TypeScript.qll b/javascript/ql/src/semmle/javascript/TypeScript.qll
index 251e4b8f6ef2..d5b1a3ded84a 100644
--- a/javascript/ql/src/semmle/javascript/TypeScript.qll
+++ b/javascript/ql/src/semmle/javascript/TypeScript.qll
@@ -35,9 +35,7 @@ class NamespaceDefinition extends Stmt, @namespacedefinition, AST::ValueNode {
   /**
    * Gets the canonical name of the namespace being defined.
    */
-  Namespace getNamespace() {
-    result.getADefinition() = this
-  }
+  Namespace getNamespace() { result.getADefinition() = this }
 }
 
 /**
@@ -57,14 +55,10 @@ class NamespaceDefinition extends Stmt, @namespacedefinition, AST::ValueNode {
  */
 class NamespaceDeclaration extends NamespaceDefinition, StmtContainer, @namespacedeclaration {
   /** Gets the name of this namespace. */
-  override Identifier getId() {
-    result = getChildExpr(-1)
-  }
+  override Identifier getId() { result = getChildExpr(-1) }
 
   /** Gets the name of this namespace as a string. */
-  override string getName() {
-    result = getId().getName()
-  }
+  override string getName() { result = getId().getName() }
 
   /** Gets the `i`th statement in this namespace. */
   Stmt getStmt(int i) {
@@ -73,14 +67,10 @@ class NamespaceDeclaration extends NamespaceDefinition, StmtContainer, @namespac
   }
 
   /** Gets a statement in this namespace. */
-  override Stmt getAStmt() {
-    result = getStmt(_)
-  }
+  override Stmt getAStmt() { result = getStmt(_) }
 
   /** Gets the number of statements in this namespace. */
-  int getNumStmt() {
-    result = count(getAStmt())
-  }
+  int getNumStmt() { result = count(getAStmt()) }
 
   override StmtContainer getEnclosingContainer() { result = this.getContainer() }
 
@@ -90,15 +80,10 @@ class NamespaceDeclaration extends NamespaceDefinition, StmtContainer, @namespac
    * A namespace that is empty or only contains interfaces and type aliases is not instantiated,
    * and thus has no namespace object at runtime and is not associated with a variable.
    */
-  predicate isInstantiated() {
-    isInstantiated(this)
-  }
+  predicate isInstantiated() { isInstantiated(this) }
 
   override ControlFlowNode getFirstControlFlowNode() {
-    if hasDeclareKeyword(this) then
-      result = this
-    else
-      result = getId()
+    if hasDeclareKeyword(this) then result = this else result = getId()
   }
 }
 
@@ -123,23 +108,17 @@ class TypeDefinition extends ASTNode, @typedefinition {
   /**
    * Gets the unqualified name of the type being defined.
    */
-  string getName() {
-    result = getIdentifier().getName()
-  }
+  string getName() { result = getIdentifier().getName() }
 
   /**
    * Gets the canonical name of the type being defined.
    */
-  TypeName getTypeName() {
-    result.getADefinition() = this
-  }
+  TypeName getTypeName() { result.getADefinition() = this }
 
   /**
    * Gets the type defined by this declaration.
    */
-  Type getType() {
-    ast_node_type(getIdentifier(), result)
-  }
+  Type getType() { ast_node_type(getIdentifier(), result) }
 }
 
 /**
@@ -153,9 +132,7 @@ class ExternalModuleDeclaration extends Stmt, StmtContainer, @externalmoduledecl
    * declare module "fs" {...}
    * ```
    */
-  StringLiteral getNameLiteral() {
-    result = getChildExpr(-1)
-  }
+  StringLiteral getNameLiteral() { result = getChildExpr(-1) }
 
   /**
    * Gets the module name, such as `fs` in:
@@ -163,9 +140,7 @@ class ExternalModuleDeclaration extends Stmt, StmtContainer, @externalmoduledecl
    * declare module "fs" {...}
    * ```
    */
-  string getName() {
-    result = getNameLiteral().getStringValue()
-  }
+  string getName() { result = getNameLiteral().getStringValue() }
 
   /** Gets the `i`th statement in this namespace. */
   Stmt getStmt(int i) {
@@ -174,14 +149,10 @@ class ExternalModuleDeclaration extends Stmt, StmtContainer, @externalmoduledecl
   }
 
   /** Gets a statement in this namespace. */
-  override Stmt getAStmt() {
-    result = getStmt(_)
-  }
+  override Stmt getAStmt() { result = getStmt(_) }
 
   /** Gets the number of statements in this namespace. */
-  int getNumStmt() {
-    result = count(getAStmt())
-  }
+  int getNumStmt() { result = count(getAStmt()) }
 
   override StmtContainer getEnclosingContainer() { result = this.getContainer() }
 
@@ -199,14 +170,10 @@ class GlobalAugmentationDeclaration extends Stmt, StmtContainer, @globalaugmenta
   }
 
   /** Gets a statement in this namespace. */
-  override Stmt getAStmt() {
-    result = getStmt(_)
-  }
+  override Stmt getAStmt() { result = getStmt(_) }
 
   /** Gets the number of statements in this namespace. */
-  int getNumStmt() {
-    result = count(getAStmt())
-  }
+  int getNumStmt() { result = count(getAStmt()) }
 
   override StmtContainer getEnclosingContainer() { result = this.getContainer() }
 
@@ -216,18 +183,12 @@ class GlobalAugmentationDeclaration extends Stmt, StmtContainer, @globalaugmenta
 /** A TypeScript "import-equals" declaration. */
 class ImportEqualsDeclaration extends Stmt, @importequalsdeclaration {
   /** Gets the name under which the imported entity is imported. */
-  Identifier getId() {
-    result = getChildExpr(0)
-  }
+  Identifier getId() { result = getChildExpr(0) }
 
   /** Gets the expression specifying the imported module or entity. */
-  Expr getImportedEntity() {
-    result = getChildExpr(1)
-  }
+  Expr getImportedEntity() { result = getChildExpr(1) }
 
-  override ControlFlowNode getFirstControlFlowNode() {
-    result = getId()
-  }
+  override ControlFlowNode getFirstControlFlowNode() { result = getId() }
 }
 
 /**
@@ -242,17 +203,11 @@ class ImportEqualsDeclaration extends Stmt, @importequalsdeclaration {
  */
 class ExternalModuleReference extends Expr, Import, @externalmodulereference {
   /** Gets the expression specifying the module. */
-  Expr getExpression() {
-    result = getChildExpr(0)
-  }
+  Expr getExpression() { result = getChildExpr(0) }
 
-  override PathExpr getImportedPath() {
-    result = getExpression()
-  }
+  override PathExpr getImportedPath() { result = getExpression() }
 
-  override Module getEnclosingModule() {
-    result = getTopLevel()
-  }
+  override Module getEnclosingModule() { result = getTopLevel() }
 
   override ControlFlowNode getFirstControlFlowNode() {
     result = getExpression().getFirstControlFlowNode()
@@ -262,7 +217,7 @@ class ExternalModuleReference extends Expr, Import, @externalmodulereference {
 /** A literal path expression appearing in an external module reference. */
 private class LiteralExternalModulePath extends PathExprInModule, ConstantString {
   LiteralExternalModulePath() {
-    exists (ExternalModuleReference emr | this.getParentExpr*() = emr.getExpression())
+    exists(ExternalModuleReference emr | this.getParentExpr*() = emr.getExpression())
   }
 
   override string getValue() { result = this.(ConstantString).getStringValue() }
@@ -271,9 +226,7 @@ private class LiteralExternalModulePath extends PathExprInModule, ConstantString
 /** A TypeScript "export-assign" declaration. */
 class ExportAssignDeclaration extends Stmt, @exportassigndeclaration {
   /** Gets the expression exported by this declaration. */
-  Expr getExpression() {
-    result = getChildExpr(0)
-  }
+  Expr getExpression() { result = getChildExpr(0) }
 }
 
 /** A TypeScript export of form `export as namespace X` where `X` is an identifier. */
@@ -281,9 +234,7 @@ class ExportAsNamespaceDeclaration extends Stmt, @exportasnamespacedeclaration {
   /**
    * Gets the `X` in `export as namespace X`.
    */
-  Identifier getIdentifier() {
-    result = getChildExpr(0)
-  }
+  Identifier getIdentifier() { result = getChildExpr(0) }
 
   override predicate isAmbient() { any() }
 }
@@ -293,98 +244,72 @@ class ExportAsNamespaceDeclaration extends Stmt, @exportasnamespacedeclaration {
  */
 class TypeAliasDeclaration extends @typealiasdeclaration, TypeParameterized, Stmt {
   /** Gets the name of this type alias as a string. */
-  string getName() {
-    result = getIdentifier().getName()
-  }
+  string getName() { result = getIdentifier().getName() }
 
-  Identifier getIdentifier() {
-    result = getChildTypeExpr(0)
-  }
+  Identifier getIdentifier() { result = getChildTypeExpr(0) }
 
-  override TypeParameter getTypeParameter(int n) {
-    result = getChildTypeExpr(n + 2)
-  }
+  override TypeParameter getTypeParameter(int n) { result = getChildTypeExpr(n + 2) }
 
   /**
    * Gets the `T` in `type A = T`.
    */
-  TypeExpr getDefinition() {
-    result = getChildTypeExpr(1)
-  }
+  TypeExpr getDefinition() { result = getChildTypeExpr(1) }
 
-  override string describe() {
-    result = "type alias " + getName()
-  }
+  override string describe() { result = "type alias " + getName() }
 
-  override predicate isAmbient() {
-    any()
-  }
+  override predicate isAmbient() { any() }
 
   /**
    * Gets the canonical name of the type being defined.
    */
-  TypeName getTypeName() {
-    result.getADefinition() = this
-  }
+  TypeName getTypeName() { result.getADefinition() = this }
 }
 
 /**
  * A TypeScript interface declaration, inline interface type, or function type.
  */
 class InterfaceDefinition extends @interfacedefinition, ClassOrInterface {
-  override predicate isAbstract() {
-    any()
-  }
+  override predicate isAbstract() { any() }
 }
 
 /** A TypeScript interface declaration. */
 class InterfaceDeclaration extends Stmt, InterfaceDefinition, @interfacedeclaration {
-  override Identifier getIdentifier() {
-    result = getChildTypeExpr(0)
-  }
+  override Identifier getIdentifier() { result = getChildTypeExpr(0) }
 
   override TypeParameter getTypeParameter(int n) {
-    exists (int astIndex | typeexprs(result, _, this, astIndex, _) | astIndex <= -2 and astIndex % 2 = 0 and n = -(astIndex + 2) / 2)
+    exists(int astIndex | typeexprs(result, _, this, astIndex, _) |
+      astIndex <= -2 and astIndex % 2 = 0 and n = -(astIndex + 2) / 2
+    )
   }
 
-  override StmtContainer getContainer() {
-    result = Stmt.super.getContainer()
-  }
+  override StmtContainer getContainer() { result = Stmt.super.getContainer() }
 
-  override predicate isAmbient() {
-    any()
-  }
+  override predicate isAmbient() { any() }
 
-  override string describe() {
-    result = "interface " + getName()
-  }
+  override string describe() { result = "interface " + getName() }
 
   /**
    * Gets the `n`th type from the `extends` clause of this interface, starting at 0.
    */
   override TypeExpr getSuperInterface(int n) {
-    exists (int astIndex | typeexprs(result, _, this, astIndex, _) | astIndex <= -1 and astIndex % 2 = -1 and n = -(astIndex + 1) / 2)
+    exists(int astIndex | typeexprs(result, _, this, astIndex, _) |
+      astIndex <= -1 and astIndex % 2 = -1 and n = -(astIndex + 1) / 2
+    )
   }
 
   /**
    * Gets any type from the `extends` clause of this interface.
    */
-  override TypeExpr getASuperInterface() {
-    result = InterfaceDefinition.super.getASuperInterface()
-  }
+  override TypeExpr getASuperInterface() { result = InterfaceDefinition.super.getASuperInterface() }
 }
 
 /** An inline TypeScript interface type, such as `{x: number; y: number}`. */
 class InterfaceTypeExpr extends TypeExpr, InterfaceDefinition, @interfacetypeexpr {
   override Identifier getIdentifier() { none() }
 
-  override StmtContainer getContainer() {
-    result = TypeExpr.super.getContainer()
-  }
+  override StmtContainer getContainer() { result = TypeExpr.super.getContainer() }
 
-  override string describe() {
-    result = "anonymous interface"
-  }
+  override string describe() { result = "anonymous interface" }
 }
 
 /**
@@ -421,14 +346,13 @@ class FunctionTypeExpr extends TypeExpr, @functiontypeexpr {
 }
 
 /** A constructor type, such as `new (x: string) => Object`. */
-class ConstructorTypeExpr extends FunctionTypeExpr, @constructortypeexpr {}
+class ConstructorTypeExpr extends FunctionTypeExpr, @constructortypeexpr { }
 
 /** A function type that is not a constructor type, such as `(x: string) => number`. */
-class PlainFunctionTypeExpr extends FunctionTypeExpr, @plainfunctiontypeexpr {}
+class PlainFunctionTypeExpr extends FunctionTypeExpr, @plainfunctiontypeexpr { }
 
 /** A possibly qualified identifier that declares or refers to a type. */
-abstract class TypeRef extends ASTNode {
-}
+abstract class TypeRef extends ASTNode { }
 
 /** An identifier declaring a type name, that is, the name of a class, interface, type parameter, or import. */
 class TypeDecl extends Identifier, TypeRef, LexicalDecl {
@@ -447,21 +371,26 @@ class TypeDecl extends Identifier, TypeRef, LexicalDecl {
    *
    * If this is an import or type alias, the local type name represents the local alias.
    */
-  LocalTypeName getLocalTypeName() {
-    result.getADeclaration() = this
-  }
+  LocalTypeName getLocalTypeName() { result.getADeclaration() = this }
 
   /**
    * Gets a string describing the type being declared, consisting of the declaration kind and
    * the name being declared, such as `class C` for a class declaration `C`.
    */
   string describe() {
-    exists (ClassOrInterface ci | this = ci.getIdentifier() | result = ci.describe()) or
-    exists (TypeParameter tp | this = tp.getIdentifier() | result = "type parameter " + getName()) or
-    exists (TypeAliasDeclaration td | this = td.getIdentifier() | result = "type alias " + getName()) or
-    exists (EnumDeclaration enum | this = enum.getIdentifier() | result = "enum " + getName()) or
-    exists (EnumMember member | this = member.getIdentifier() | result = "enum member " + member.getPrefixedName()) or
-    exists (ImportSpecifier im | this = im.getLocal() | result = "imported type " + getName())
+    exists(ClassOrInterface ci | this = ci.getIdentifier() | result = ci.describe())
+    or
+    exists(TypeParameter tp | this = tp.getIdentifier() | result = "type parameter " + getName())
+    or
+    exists(TypeAliasDeclaration td | this = td.getIdentifier() | result = "type alias " + getName())
+    or
+    exists(EnumDeclaration enum | this = enum.getIdentifier() | result = "enum " + getName())
+    or
+    exists(EnumMember member | this = member.getIdentifier() |
+      result = "enum member " + member.getPrefixedName()
+    )
+    or
+    exists(ImportSpecifier im | this = im.getLocal() | result = "imported type " + getName())
   }
 }
 
@@ -493,19 +422,13 @@ class TypeDecl extends Identifier, TypeRef, LexicalDecl {
  */
 class LocalTypeName extends @local_type_name, LexicalName {
   /** Gets the local name of this type. */
-  override string getName() {
-    local_type_names(this, result, _)
-  }
+  override string getName() { local_type_names(this, result, _) }
 
   /** Gets the scope this type name is declared in. */
-  override Scope getScope() {
-    local_type_names(this, _, result)
-  }
+  override Scope getScope() { local_type_names(this, _, result) }
 
   /** Gets a textual representation of this element. */
-  override string toString() {
-    result = getName()
-  }
+  override string toString() { result = getName() }
 
   /**
    * Gets a declaration of this type name.
@@ -513,9 +436,7 @@ class LocalTypeName extends @local_type_name, LexicalName {
    * All local type names have at least one declaration and may have
    * multiple declarations in case these are interface declarations.
    */
-  TypeDecl getADeclaration() {
-    typedecl(result, this)
-  }
+  TypeDecl getADeclaration() { typedecl(result, this) }
 
   /**
    * Gets the first declaration of this type name.
@@ -525,23 +446,15 @@ class LocalTypeName extends @local_type_name, LexicalName {
   }
 
   /** Gets a use of this type name in a type annotation. */
-  LocalTypeAccess getATypeAccess() {
-    typebind(result, this)
-  }
+  LocalTypeAccess getATypeAccess() { typebind(result, this) }
 
   /** Gets a use of this type name in an export. */
-  ExportVarAccess getAnExportAccess() {
-    typebind(result, this)
-  }
+  ExportVarAccess getAnExportAccess() { typebind(result, this) }
 
   /** Gets an identifier that refers to this type name. */
-  Identifier getAnAccess() {
-    typebind(result, this)
-  }
+  Identifier getAnAccess() { typebind(result, this) }
 
-  override DeclarationSpace getDeclarationSpace() {
-    result = "type"
-  }
+  override DeclarationSpace getDeclarationSpace() { result = "type" }
 }
 
 /**
@@ -569,19 +482,13 @@ class LocalTypeName extends @local_type_name, LexicalName {
  */
 class LocalNamespaceName extends @local_namespace_name, LexicalName {
   /** Gets the local name of this namespace. */
-  override string getName() {
-    local_namespace_names(this, result, _)
-  }
+  override string getName() { local_namespace_names(this, result, _) }
 
   /** Gets the scope this namespace name is declared in. */
-  override Scope getScope() {
-    local_namespace_names(this, _, result)
-  }
+  override Scope getScope() { local_namespace_names(this, _, result) }
 
   /** Gets a textual representation of this element. */
-  override string toString() {
-    result = getName()
-  }
+  override string toString() { result = getName() }
 
   /**
    * Gets a declaration of this namespace name.
@@ -589,9 +496,7 @@ class LocalNamespaceName extends @local_namespace_name, LexicalName {
    * All local namespace names have at least one declaration and may have
    * multiple declarations unless it comes from an import.
    */
-  LocalNamespaceDecl getADeclaration() {
-    namespacedecl(result, this)
-  }
+  LocalNamespaceDecl getADeclaration() { namespacedecl(result, this) }
 
   /**
    * Gets the first declaration of this namespace name.
@@ -601,30 +506,20 @@ class LocalNamespaceName extends @local_namespace_name, LexicalName {
   }
 
   /** Gets a use of this namespace name in a type annotation. */
-  LocalNamespaceAccess getATypeAccess() {
-    namespacebind(result, this)
-  }
+  LocalNamespaceAccess getATypeAccess() { namespacebind(result, this) }
 
   /** Gets a use of this namespace in an export. */
-  ExportVarAccess getAnExportAccess() {
-    namespacebind(result, this)
-  }
+  ExportVarAccess getAnExportAccess() { namespacebind(result, this) }
 
   /** Gets an identifier that refers to this namespace name. */
-  Identifier getAnAccess() {
-    namespacebind(result, this)
-  }
+  Identifier getAnAccess() { namespacebind(result, this) }
 
   /**
    * Gets the canonical name of the namespace referenced by this name.
    */
-  Namespace getNamespace() {
-    result = getADeclaration().getNamespace()
-  }
+  Namespace getNamespace() { result = getADeclaration().getNamespace() }
 
-  override DeclarationSpace getDeclarationSpace() {
-    result = "namespace"
-  }
+  override DeclarationSpace getDeclarationSpace() { result = "namespace" }
 }
 
 /**
@@ -634,9 +529,7 @@ class LocalNamespaceName extends @local_namespace_name, LexicalName {
  * types inferred by the TypeScript compiler are not type expressions.
  */
 class TypeExpr extends ExprOrType, @typeexpr {
-  override string toString() {
-    typeexprs(this, _, _, _, result)
-  }
+  override string toString() { typeexprs(this, _, _, _, result) }
 
   /** Holds if this is the `any` type. */
   predicate isAny() { none() }
@@ -690,9 +583,7 @@ class TypeExpr extends ExprOrType, @typeexpr {
   predicate isUnknownKeyword() { none() }
 
   /** Gets this type expression, with any surrounding parentheses removed. */
-  override TypeExpr stripParens() {
-    result = this
-  }
+  override TypeExpr stripParens() { result = this }
 
   override predicate isAmbient() { any() }
 
@@ -702,9 +593,7 @@ class TypeExpr extends ExprOrType, @typeexpr {
    * Has no result if this occurs in a TypeScript file that was extracted
    * without type information.
    */
-  Type getType() {
-    ast_node_type(this, result)
-  }
+  Type getType() { ast_node_type(this, result) }
 }
 
 /**
@@ -714,20 +603,35 @@ private class KeywordTypeExpr extends @keywordtypeexpr, TypeExpr {
   string getName() { literals(result, _, this) }
 
   override predicate isAny() { getName() = "any" }
+
   override predicate isString() { getName() = "string" }
+
   override predicate isStringy() { getName() = "string" }
+
   override predicate isNumber() { getName() = "number" }
+
   override predicate isNumbery() { getName() = "number" }
+
   override predicate isBoolean() { getName() = "boolean" }
+
   override predicate isBooleany() { getName() = "boolean" }
+
   override predicate isUndefined() { getName() = "undefined" }
+
   override predicate isNull() { getName() = "null" }
+
   override predicate isVoid() { getName() = "void" }
+
   override predicate isNever() { getName() = "never" }
+
   override predicate isThis() { getName() = "this" }
+
   override predicate isSymbol() { getName() = "symbol" }
+
   override predicate isUniqueSymbol() { getName() = "unique symbol" }
+
   override predicate isObjectKeyword() { getName() = "object" }
+
   override predicate isUnknownKeyword() { getName() = "unknown" }
 }
 
@@ -743,11 +647,7 @@ class PredefinedTypeExpr extends KeywordTypeExpr {
 /**
  * A use of the `this` type.
  */
-class ThisTypeExpr extends KeywordTypeExpr {
-  ThisTypeExpr() {
-    isThis()
-  }
-}
+class ThisTypeExpr extends KeywordTypeExpr { ThisTypeExpr() { isThis() } }
 
 /**
  * A possibly qualified name that is used as part of a type, such as `Date` or `http.ServerRequest`.
@@ -803,16 +703,17 @@ class TypeAccess extends @typeaccess, TypeExpr, TypeRef {
   /**
    * Gets the canonical name of the type being accessed.
    */
-  TypeName getTypeName() {
-    ast_node_symbol(this, result)
-  }
+  TypeName getTypeName() { ast_node_symbol(this, result) }
 }
 
 /** An identifier that is used as part of a type, such as `Date`. */
 class LocalTypeAccess extends @localtypeaccess, TypeAccess, Identifier, LexicalAccess {
   override predicate isStringy() { getName() = "String" }
+
   override predicate isNumbery() { getName() = "Number" }
+
   override predicate isBooleany() { getName() = "Boolean" }
+
   override predicate isRawFunction() { getName() = "Function" }
 
   override Identifier getIdentifier() { result = this }
@@ -826,9 +727,7 @@ class LocalTypeAccess extends @localtypeaccess, TypeAccess, Identifier, LexicalA
    * For example, in `Array<number>`, the `Array` name will usually not have
    * a local type name as it is declared in `lib.d.ts`.
    */
-  LocalTypeName getLocalTypeName() {
-    result.getAnAccess() = this
-  }
+  LocalTypeName getLocalTypeName() { result.getAnAccess() = this }
 }
 
 /**
@@ -874,34 +773,28 @@ class GenericTypeExpr extends @generictypeexpr, TypeExpr {
  */
 class LiteralTypeExpr extends @literaltypeexpr, TypeExpr {
   /** Gets the value of this literal, as a string. */
-  string getValue() {
-    literals(result, _, this)
-  }
+  string getValue() { literals(result, _, this) }
 
   /**
    * Gets the raw source text of this literal, including quotes for
    * string literals.
    */
-  string getRawValue() {
-    literals(_, result, this)
-  }
+  string getRawValue() { literals(_, result, this) }
 }
 
 /** A string literal used as a type. */
-class StringLiteralTypeExpr extends @stringliteraltypeexpr, LiteralTypeExpr {
-}
+class StringLiteralTypeExpr extends @stringliteraltypeexpr, LiteralTypeExpr { }
 
 /** A number literal used as a type. */
 class NumberLiteralTypeExpr extends @numberliteraltypeexpr, LiteralTypeExpr {
   /** Gets the integer value of this literal type. */
-  int getIntValue() {
-    result = getValue().toInt()
-  }
+  int getIntValue() { result = getValue().toInt() }
 }
 
 /** A boolean literal used as a type. */
 class BooleanLiteralTypeExpr extends @booleanliteraltypeexpr, LiteralTypeExpr {
   predicate isTrue() { getValue() = "true" }
+
   predicate isFalse() { getValue() = "false" }
 }
 
@@ -914,9 +807,7 @@ class BooleanLiteralTypeExpr extends @booleanliteraltypeexpr, LiteralTypeExpr {
  */
 class ArrayTypeExpr extends @arraytypeexpr, TypeExpr {
   /** Gets the type of the array elements. */
-  TypeExpr getElementType() {
-    result = getChildTypeExpr(0)
-  }
+  TypeExpr getElementType() { result = getChildTypeExpr(0) }
 }
 
 /**
@@ -924,19 +815,13 @@ class ArrayTypeExpr extends @arraytypeexpr, TypeExpr {
  */
 class UnionTypeExpr extends @uniontypeexpr, TypeExpr {
   /** Gets the `n`th type in the union, starting at 0. */
-  TypeExpr getElementType(int n) {
-    result = getChildTypeExpr(n)
-  }
+  TypeExpr getElementType(int n) { result = getChildTypeExpr(n) }
 
   /** Gets any of the types in the union. */
-  TypeExpr getAnElementType() {
-    result = getElementType(_)
-  }
+  TypeExpr getAnElementType() { result = getElementType(_) }
 
   /** Gets the number of types in the union. This is always at least two. */
-  int getNumElementType() {
-    result = count(getAnElementType())
-  }
+  int getNumElementType() { result = count(getAnElementType()) }
 }
 
 /**
@@ -944,14 +829,10 @@ class UnionTypeExpr extends @uniontypeexpr, TypeExpr {
  */
 class IndexedAccessTypeExpr extends @indexedaccesstypeexpr, TypeExpr {
   /** Gets the type `T` in `T[K]`, denoting the object type whose properties are to be extracted. */
-  TypeExpr getObjectType() {
-    result = getChildTypeExpr(0)
-  }
+  TypeExpr getObjectType() { result = getChildTypeExpr(0) }
 
   /** Gets the type `K` in `T[K]`, denoting the property names to extract from the object type. */
-  TypeExpr getIndexType() {
-    result = getChildTypeExpr(1)
-  }
+  TypeExpr getIndexType() { result = getChildTypeExpr(1) }
 }
 
 /**
@@ -961,19 +842,13 @@ class IndexedAccessTypeExpr extends @indexedaccesstypeexpr, TypeExpr {
  */
 class IntersectionTypeExpr extends @intersectiontypeexpr, TypeExpr {
   /** Gets the `n`th operand of the intersection type, starting at 0. */
-  TypeExpr getElementType(int n) {
-    result = getChildTypeExpr(n)
-  }
+  TypeExpr getElementType(int n) { result = getChildTypeExpr(n) }
 
   /** Gets any of the operands to the intersection type. */
-  TypeExpr getAnElementType() {
-    result = getElementType(_)
-  }
+  TypeExpr getAnElementType() { result = getElementType(_) }
 
   /** Gets the number of operands to the intersection type. This is always at least two. */
-  int getNumElementType() {
-    result = count(getAnElementType())
-  }
+  int getNumElementType() { result = count(getAnElementType()) }
 }
 
 /**
@@ -981,13 +856,9 @@ class IntersectionTypeExpr extends @intersectiontypeexpr, TypeExpr {
  */
 class ParenthesizedTypeExpr extends @parenthesizedtypeexpr, TypeExpr {
   /** Gets the type inside the parentheses. */
-  TypeExpr getElementType() {
-    result = getChildTypeExpr(0)
-  }
+  TypeExpr getElementType() { result = getChildTypeExpr(0) }
 
-  override TypeExpr stripParens() {
-    result = getElementType().stripParens()
-  }
+  override TypeExpr stripParens() { result = getElementType().stripParens() }
 }
 
 /**
@@ -995,19 +866,13 @@ class ParenthesizedTypeExpr extends @parenthesizedtypeexpr, TypeExpr {
  */
 class TupleTypeExpr extends @tupletypeexpr, TypeExpr {
   /** Gets the `n`th element type in the tuple, starting at 0. */
-  TypeExpr getElementType(int n) {
-    result = getChildTypeExpr(n)
-  }
+  TypeExpr getElementType(int n) { result = getChildTypeExpr(n) }
 
   /** Gets any of the element types in the tuple. */
-  TypeExpr getAnElementType() {
-    result = getElementType(_)
-  }
+  TypeExpr getAnElementType() { result = getElementType(_) }
 
   /** Gets the number of elements in the tuple type. */
-  int getNumElementType() {
-    result = count(getAnElementType())
-  }
+  int getNumElementType() { result = count(getAnElementType()) }
 }
 
 /**
@@ -1015,9 +880,7 @@ class TupleTypeExpr extends @tupletypeexpr, TypeExpr {
  */
 class KeyofTypeExpr extends @keyoftypeexpr, TypeExpr {
   /** Gets the type `T` in `keyof T`, denoting the object type whose property names are to be extracted. */
-  TypeExpr getElementType() {
-    result = getChildTypeExpr(0)
-  }
+  TypeExpr getElementType() { result = getChildTypeExpr(0) }
 }
 
 /**
@@ -1028,24 +891,16 @@ class MappedTypeExpr extends @mappedtypeexpr, TypeParameterized, TypeExpr {
   /**
    * Gets the `K in C` part from `{ [K in C]: T }`.
    */
-  TypeParameter getTypeParameter() {
-    result = getChildTypeExpr(0)
-  }
+  TypeParameter getTypeParameter() { result = getChildTypeExpr(0) }
 
-  override TypeParameter getTypeParameter(int n) {
-    n = 0 and result = getTypeParameter()
-  }
+  override TypeParameter getTypeParameter(int n) { n = 0 and result = getTypeParameter() }
 
   /**
    * Gets the `T` part from `{ [K in C]: T }`.
    */
-  TypeExpr getElementType() {
-    result = getChildTypeExpr(1)
-  }
+  TypeExpr getElementType() { result = getChildTypeExpr(1) }
 
-  override string describe() {
-    result = "mapped type"
-  }
+  override string describe() { result = "mapped type" }
 }
 
 /**
@@ -1111,8 +966,7 @@ class RestTypeExpr extends @resttypeexpr, TypeExpr {
  *
  * In the latter case, this may also refer to the pseudo-variable `this`.
  */
-class VarTypeAccess extends @vartypeaccess, TypeExpr {
-}
+class VarTypeAccess extends @vartypeaccess, TypeExpr { }
 
 /**
  * An identifier that refers to a variable from inside a type.
@@ -1132,7 +986,7 @@ class LocalVarTypeAccess extends @localvartypeaccess, VarTypeAccess, LexicalAcce
  * interface Node { isLeaf(): this is Leaf; }
  * ```
  */
-class ThisVarTypeAccess extends @thisvartypeaccess, VarTypeAccess {}
+class ThisVarTypeAccess extends @thisvartypeaccess, VarTypeAccess { }
 
 /**
  * A qualified name that refers to a variable from inside a type.
@@ -1183,17 +1037,11 @@ class InferTypeExpr extends @infertypeexpr, TypeParameterized, TypeExpr {
   /**
    * Gets the type parameter capturing the matched type, such as `R` in `infer R`.
    */
-  TypeParameter getTypeParameter() {
-    result = getChildTypeExpr(0)
-  }
+  TypeParameter getTypeParameter() { result = getChildTypeExpr(0) }
 
-  override TypeParameter getTypeParameter(int n) {
-    n = 0 and result = getTypeParameter()
-  }
+  override TypeParameter getTypeParameter(int n) { n = 0 and result = getTypeParameter() }
 
-  override string describe() {
-    result = "'infer' type " + getTypeParameter().getName()
-  }
+  override string describe() { result = "'infer' type " + getTypeParameter().getName() }
 }
 
 /**
@@ -1202,9 +1050,7 @@ class InferTypeExpr extends @infertypeexpr, TypeParameterized, TypeExpr {
  */
 class ConditionalTypeScope extends @conditionaltypescope, Scope {
   /** Gets the conditional type expression that induced this scope. */
-  ConditionalTypeExpr getConditionalTypeExpr() {
-    result = Scope.super.getScopeElement()
-  }
+  ConditionalTypeExpr getConditionalTypeExpr() { result = Scope.super.getScopeElement() }
 }
 
 /**
@@ -1296,9 +1142,7 @@ class TypeParameter extends @typeparameter, TypeExpr {
   /**
    * Gets the local type name declared by this type parameter.
    */
-  LocalTypeName getLocalTypeName() {
-      result = getIdentifier().(TypeDecl).getLocalTypeName()
-  }
+  LocalTypeName getLocalTypeName() { result = getIdentifier().(TypeDecl).getLocalTypeName() }
 }
 
 /**
@@ -1316,25 +1160,20 @@ class TypeAssertion extends Expr, @typeassertion {
     result = getExpression().getFirstControlFlowNode()
   }
 
-  override Expr getUnderlyingValue() {
-    result = getExpression().getUnderlyingValue()
-  }
-
-  override Expr getUnderlyingReference() {
-    result = getExpression().getUnderlyingReference()
-  }
+  override Expr getUnderlyingValue() { result = getExpression().getUnderlyingValue() }
 
+  override Expr getUnderlyingReference() { result = getExpression().getUnderlyingReference() }
 }
 
 /**
  * A type assertion specifically of the form `E as T` (as opposed to the `<T> E` syntax).
  */
-class AsTypeAssertion extends TypeAssertion, @astypeassertion {}
+class AsTypeAssertion extends TypeAssertion, @astypeassertion { }
 
 /**
  * A type assertion specifically of the form `<T> E` (as opposed to the `E as T` syntax).
  */
-class PrefixTypeAssertion extends TypeAssertion, @prefixtypeassertion {}
+class PrefixTypeAssertion extends TypeAssertion, @prefixtypeassertion { }
 
 /**
  * A TypeScript expression of form `E!`, asserting that `E` is not null.
@@ -1351,7 +1190,7 @@ class NonNullAssertion extends Expr, @non_null_assertion {
 /**
  * A possibly qualified identifier that refers to or declares a local name for a namespace.
  */
-abstract class NamespaceRef extends ASTNode {}
+abstract class NamespaceRef extends ASTNode { }
 
 /**
  * An identifier that declares a local name for a namespace, that is,
@@ -1376,16 +1215,12 @@ class LocalNamespaceDecl extends VarDecl, NamespaceRef {
   }
 
   /** Gets the local name being declared. */
-  LocalNamespaceName getLocalNamespaceName() {
-    namespacedecl(this, result)
-  }
+  LocalNamespaceName getLocalNamespaceName() { namespacedecl(this, result) }
 
   /**
    * Gets the canonical name of the namespace being defined or aliased by this name.
    */
-  Namespace getNamespace() {
-    ast_node_symbol(this, result)
-  }
+  Namespace getNamespace() { ast_node_symbol(this, result) }
 }
 
 /**
@@ -1403,9 +1238,7 @@ class NamespaceAccess extends TypeExpr, NamespaceRef, @namespaceaccess {
   /**
    * Gets the canonical name of the namespace being accessed.
    */
-  Namespace getNamespace() {
-    ast_node_symbol(this, result)
-  }
+  Namespace getNamespace() { ast_node_symbol(this, result) }
 }
 
 /**
@@ -1415,9 +1248,7 @@ class LocalNamespaceAccess extends NamespaceAccess, LexicalAccess, Identifier, @
   override Identifier getIdentifier() { result = this }
 
   /** Gets the local name being accessed. */
-  LocalNamespaceName getLocalNamespaceName() {
-    namespacebind(this, result)
-  }
+  LocalNamespaceName getLocalNamespaceName() { namespacebind(this, result) }
 }
 
 /**
@@ -1425,6 +1256,7 @@ class LocalNamespaceAccess extends NamespaceAccess, LexicalAccess, Identifier, @
  */
 class QualifiedNamespaceAccess extends NamespaceAccess, @qualifiednamespaceaccess {
   NamespaceAccess getQualifier() { result = getChildTypeExpr(0) }
+
   override Identifier getIdentifier() { result = getChildTypeExpr(1) }
 }
 
@@ -1435,50 +1267,37 @@ class ImportTypeExpr extends TypeExpr, @importtypeexpr {
   /**
    * Gets the string literal with the imported path, such as `"http"` in `import("http")`.
    */
-  TypeExpr getPathExpr() {
-    result = getChildTypeExpr(0)
-  }
+  TypeExpr getPathExpr() { result = getChildTypeExpr(0) }
 
   /**
    * Gets the unresolved path string, such as `http` in `import("http")`.
    */
-  string getPath() {
-    result = getPathExpr().(StringLiteralTypeExpr).getValue()
-  }
+  string getPath() { result = getPathExpr().(StringLiteralTypeExpr).getValue() }
 
   /** Holds if this import is used in the context of a type, such as in `let x: import("foo")`. */
-  predicate isTypeAccess() {
-    this instanceof @importtypeaccess
-  }
+  predicate isTypeAccess() { this instanceof @importtypeaccess }
 
   /** Holds if this import is used in the context of a namespace, such as in `let x: import("http").ServerRequest"`. */
-  predicate isNamespaceAccess() {
-    this instanceof @importnamespaceaccess
-  }
+  predicate isNamespaceAccess() { this instanceof @importnamespaceaccess }
 
   /** Holds if this import is used in the context of a variable type, such as `let x: typeof import("fs")`. */
-  predicate isVarTypeAccess() {
-    this instanceof @importvartypeaccess
-  }
+  predicate isVarTypeAccess() { this instanceof @importvartypeaccess }
 }
 
 /**
  * An import used in the context of a type, such as in `let x: import("foo")`.
  */
-class ImportTypeAccess extends TypeAccess, ImportTypeExpr, @importtypeaccess {
-}
+class ImportTypeAccess extends TypeAccess, ImportTypeExpr, @importtypeaccess { }
 
 /**
  * An import used in the context of a namespace inside a type annotation, such as in `let x: import("http").ServerRequest`.
  */
-class ImportNamespaceAccess extends NamespaceAccess, ImportTypeExpr, @importnamespaceaccess {
-}
+class ImportNamespaceAccess extends NamespaceAccess, ImportTypeExpr, @importnamespaceaccess { }
 
 /**
  * An import used in the context of a variable type, such as in `let x: typeof import("fs")`.
  */
-class ImportVarTypeAccess extends VarTypeAccess, ImportTypeExpr, @importvartypeaccess {
-}
+class ImportVarTypeAccess extends VarTypeAccess, ImportTypeExpr, @importvartypeaccess { }
 
 /**
  * A TypeScript enum declaration, such as the following declaration:
@@ -1488,14 +1307,10 @@ class ImportVarTypeAccess extends VarTypeAccess, ImportTypeExpr, @importvartypea
  */
 class EnumDeclaration extends NamespaceDefinition, @enumdeclaration, AST::ValueNode {
   /** Gets the name of this enum, such as `E` in `enum E { A, B }`. */
-  Identifier getIdentifier() {
-    result = getChildExpr(0)
-  }
+  Identifier getIdentifier() { result = getChildExpr(0) }
 
   /** Gets the name of this enum as a string. */
-  override string getName() {
-    result = getIdentifier().getName()
-  }
+  override string getName() { result = getIdentifier().getName() }
 
   /**
    * Gets the variable holding the enumeration object.
@@ -1506,25 +1321,19 @@ class EnumDeclaration extends NamespaceDefinition, @enumdeclaration, AST::ValueN
    * and all uses of the variable will be constant-folded by the TypeScript compiler,
    * but the analysis models it as an ordinary variable.
    */
-  Variable getVariable() {
-    result = getIdentifier().(VarDecl).getVariable()
-  }
+  Variable getVariable() { result = getIdentifier().(VarDecl).getVariable() }
 
   /**
    * Gets the local type name introduced by the enumeration.
    *
    * For example, this would be the type `E` introduced by `enum E { A, B }`.
    */
-  LocalTypeName getLocalTypeName() {
-    result = getIdentifier().(TypeDecl).getLocalTypeName()
-  }
+  LocalTypeName getLocalTypeName() { result = getIdentifier().(TypeDecl).getLocalTypeName() }
 
   /**
    * Gets the canonical name of the type being defined.
    */
-  TypeName getTypeName() {
-    ast_node_symbol(this, result)
-  }
+  TypeName getTypeName() { ast_node_symbol(this, result) }
 
   /**
    * Gets the local namespace name introduced by the enumeration, for use in
@@ -1542,52 +1351,32 @@ class EnumDeclaration extends NamespaceDefinition, @enumdeclaration, AST::ValueN
   }
 
   /** Gets the `n`th enum member, starting at 0, such as `A` or `B` in `enum E { A, B }`. */
-  EnumMember getMember(int n) {
-    properties(result, this, n + 1, _, _)
-  }
+  EnumMember getMember(int n) { properties(result, this, n + 1, _, _) }
 
   /** Gets the enum member with the given name, if any. */
-  EnumMember getMemberByName(string name) {
-    result = getAMember() and result.getName() = name
-  }
+  EnumMember getMemberByName(string name) { result = getAMember() and result.getName() = name }
 
   /** Gets any of the enum members. */
-  EnumMember getAMember() {
-    result = getMember(_)
-  }
+  EnumMember getAMember() { result = getMember(_) }
 
   /** Gets the number of enum members. */
-  int getNumMember() {
-    result = count(getAMember())
-  }
+  int getNumMember() { result = count(getAMember()) }
 
   /** Gets the `n`th decorator applied to this enum declaration. */
-  Decorator getDecorator(int n) {
-    result = getChildExpr(-n - 1)
-  }
+  Decorator getDecorator(int n) { result = getChildExpr(-n - 1) }
 
   /** Gets a decorator applied to this enum declaration. */
-  Decorator getADecorator() {
-    result = getDecorator(_)
-  }
+  Decorator getADecorator() { result = getDecorator(_) }
 
   /** Gets the number of decorators applied to this enum declaration. */
-  int getNumDecorator() {
-    result = count(getADecorator())
-  }
+  int getNumDecorator() { result = count(getADecorator()) }
 
   /** Holds if this enumeration is declared with the `const` keyword. */
-  predicate isConst() {
-    isConstEnum(this)
-  }
+  predicate isConst() { isConstEnum(this) }
 
-  override predicate isAmbient() {
-    hasDeclareKeyword(this) or getParent().isAmbient()
-  }
+  override predicate isAmbient() { hasDeclareKeyword(this) or getParent().isAmbient() }
 
-  override ControlFlowNode getFirstControlFlowNode() {
-    result = getIdentifier()
-  }
+  override ControlFlowNode getFirstControlFlowNode() { result = getIdentifier() }
 }
 
 /**
@@ -1604,32 +1393,20 @@ class EnumMember extends ASTNode, @enum_member {
    * a synthetic identifier node is created to represent the name.
    * In other words, the name will always be an identifier node.
    */
-  Identifier getIdentifier() {
-    result = getChildExpr(0)
-  }
+  Identifier getIdentifier() { result = getChildExpr(0) }
 
   /** Gets the name of the enum member as a string. */
-  string getName() {
-    result = getIdentifier().getName()
-  }
+  string getName() { result = getIdentifier().getName() }
 
   /** Gets the explicit initializer expression of this member, if any. */
-  Expr getInitializer() {
-    result = getChildExpr(1)
-  }
+  Expr getInitializer() { result = getChildExpr(1) }
 
   /** Gets the enum declaring this member. */
-  EnumDeclaration getDeclaringEnum() {
-    result.getAMember() = this
-  }
+  EnumDeclaration getDeclaringEnum() { result.getAMember() = this }
 
-  override string toString() {
-    properties(this, _, _, _, result)
-  }
+  override string toString() { properties(this, _, _, _, result) }
 
-  override ControlFlowNode getFirstControlFlowNode() {
-    result = getIdentifier()
-  }
+  override ControlFlowNode getFirstControlFlowNode() { result = getIdentifier() }
 
   /**
    * Gets the name of the member prefixed by the declaring enum name.
@@ -1639,16 +1416,12 @@ class EnumMember extends ASTNode, @enum_member {
    * enum Color { red, green, blue }
    * ```
    */
-  string getPrefixedName() {
-    result = getDeclaringEnum().getName() + "." + getName()
-  }
+  string getPrefixedName() { result = getDeclaringEnum().getName() + "." + getName() }
 
   /**
    * Gets the canonical name of the type defined by this enum member.
    */
-  TypeName getTypeName() {
-    ast_node_symbol(this, result)
-  }
+  TypeName getTypeName() { ast_node_symbol(this, result) }
 }
 
 /**
@@ -1657,9 +1430,7 @@ class EnumMember extends ASTNode, @enum_member {
  * Interfaces that do not declare type parameters have no scope object.
  */
 class InterfaceScope extends @interfacescope, Scope {
-  override string toString() {
-    result = "interface scope"
-  }
+  override string toString() { result = "interface scope" }
 }
 
 /**
@@ -1668,18 +1439,14 @@ class InterfaceScope extends @interfacescope, Scope {
  * Type aliases that do not declare type parameters have no scope object.
  */
 class TypeAliasScope extends @typealiasscope, Scope {
-  override string toString() {
-    result = "type alias scope"
-  }
+  override string toString() { result = "type alias scope" }
 }
 
 /**
  * Scope induced by a mapped type expression, containing the type parameter declared as part of the type.
  */
 class MappedTypeScope extends @mappedtypescope, Scope {
-  override string toString() {
-    result = "mapped type scope"
-  }
+  override string toString() { result = "mapped type scope" }
 }
 
 /**
@@ -1688,19 +1455,13 @@ class MappedTypeScope extends @mappedtypescope, Scope {
  * Initializers of enum members are resolved in this scope since they can reference
  * previously-defined enum members by their unqualified name.
  */
-class EnumScope extends @enumscope, Scope {
-  override string toString() {
-    result = "enum scope"
-  }
-}
+class EnumScope extends @enumscope, Scope { override string toString() { result = "enum scope" } }
 
 /**
  * Scope induced by a declaration of form `declare module "X" {...}`.
  */
 class ExternalModuleScope extends @externalmodulescope, Scope {
-  override string toString() {
-    result = "external module scope"
-  }
+  override string toString() { result = "external module scope" }
 }
 
 /**
@@ -1712,13 +1473,17 @@ class ExternalModuleScope extends @externalmodulescope, Scope {
  */
 class ReferenceImport extends LineComment {
   string attribute;
+
   string value;
 
   ReferenceImport() {
     getFile().getFileType().isTypeScript() and
-    exists (string regex | regex = "/\\s*<reference\\s+([a-z]+)\\s*=\\s*[\"']([^\"']*)[\"']\\s*/>\\s*" |
+    exists(string regex |
+      regex = "/\\s*<reference\\s+([a-z]+)\\s*=\\s*[\"']([^\"']*)[\"']\\s*/>\\s*"
+    |
       attribute = getText().regexpCapture(regex, 1) and
-      value = getText().regexpCapture(regex, 2)) and
+      value = getText().regexpCapture(regex, 2)
+    ) and
     (attribute = "path" or attribute = "types")
   }
 
@@ -1750,13 +1515,9 @@ class ReferenceImport extends LineComment {
  * ```
  */
 class ReferencePathImport extends ReferenceImport {
-  ReferencePathImport() {
-    attribute = "path"
-  }
+  ReferencePathImport() { attribute = "path" }
 
-  override File getImportedFile() {
-    result = this.(PathExpr).resolve()
-  }
+  override File getImportedFile() { result = this.(PathExpr).resolve() }
 }
 
 /**
@@ -1782,15 +1543,16 @@ private class ReferenceImportAsPathExpr extends PathExpr {
  * ```
  */
 class ReferenceTypesImport extends ReferenceImport {
-  ReferenceTypesImport() {
-    attribute = "types"
-  }
+  ReferenceTypesImport() { attribute = "types" }
 
   override File getImportedFile() {
-    result = min (Folder nodeModules, int distance |
-      findNodeModulesFolder(getFile().getParentContainer(), nodeModules, distance) |
-      nodeModules.getFolder("@types").getFolder(value).getFile("index.d.ts")
-      order by distance)
+    result = min(Folder nodeModules, int distance |
+        findNodeModulesFolder(getFile().getParentContainer(), nodeModules, distance)
+      |
+        nodeModules.getFolder("@types").getFolder(value).getFile("index.d.ts")
+        order by
+          distance
+      )
   }
 }
 
@@ -1801,26 +1563,23 @@ class ReferenceTypesImport extends ReferenceImport {
  */
 class TypeRootFolder extends Folder {
   TypeRootFolder() {
-    exists (Folder nodeModules |
+    exists(Folder nodeModules |
       nodeModules.getBaseName() = "node_modules" and
-      nodeModules.getFolder("@types") = this)
+      nodeModules.getFolder("@types") = this
+    )
   }
 
   /**
    * Gets the enclosing `node_modules` folder.
    */
-  Folder getNodeModulesFolder() {
-    result = getParentContainer()
-  }
+  Folder getNodeModulesFolder() { result = getParentContainer() }
 
   /**
    * Gets the `d.ts` file correspnding to the given module name.
    *
    * Concretely, this is the file at `node_modules/@types/<moduleName>/index.d.ts` if it exists.
    */
-  File getModuleFile(string moduleName) {
-    result = getFolder(moduleName).getFile("index.d.ts")
-  }
+  File getModuleFile(string moduleName) { result = getFolder(moduleName).getFile("index.d.ts") }
 
   /**
    * Gets the priority with which this type root folder should be used from within the given search root.
@@ -1831,7 +1590,6 @@ class TypeRootFolder extends Folder {
 }
 
 /// Types
-
 /**
  * A static type in the TypeScript type system.
  *
@@ -1857,34 +1615,26 @@ class Type extends @type {
   /**
    * Gets the `i`th child of this type.
    */
-  Type getChild(int i) {
-    type_child(result, this, i)
-  }
+  Type getChild(int i) { type_child(result, this, i) }
 
   /**
    * Gets the type of the given property of this type.
    *
    * Note that this does not account for properties implied by index signatures.
    */
-  Type getProperty(string name) {
-    type_property(this, name, result)
-  }
+  Type getProperty(string name) { type_property(this, name, result) }
 
   /**
    * Gets the type of the string index signature on this type,
    * such as `T` in the type `{ [s: string]: T }`.
    */
-  Type getStringIndexType() {
-    string_index_type(this, result)
-  }
+  Type getStringIndexType() { string_index_type(this, result) }
 
   /**
    * Gets the type of the number index signature on this type,
    * such as `T` in the type `{ [n: number]: T }`.
    */
-  Type getNumberIndexType() {
-    number_index_type(this, result)
-  }
+  Type getNumberIndexType() { number_index_type(this, result) }
 
   /**
    * Gets the `n`th signature of the given kind present on this type.
@@ -1908,9 +1658,7 @@ class Type extends @type {
   /**
    * Gets the number of signatures of the given kind.
    */
-  int getNumSignature(SignatureKind kind) {
-    result = count(getASignature(kind))
-  }
+  int getNumSignature(SignatureKind kind) { result = count(getASignature(kind)) }
 
   /**
    * Gets the last signature of the given kind.
@@ -1932,16 +1680,12 @@ class Type extends @type {
   /**
    * Gets a function call signature.
    */
-  FunctionCallSignatureType getAFunctionSignature() {
-    type_contains_signature(this, _, _, result)
-  }
+  FunctionCallSignatureType getAFunctionSignature() { type_contains_signature(this, _, _, result) }
 
   /**
    * Gets the number of function call signatures.
    */
-  int getNumFunctionSignature() {
-    result = count(getAFunctionSignature())
-  }
+  int getNumFunctionSignature() { result = count(getAFunctionSignature()) }
 
   /**
    * Gets the last function call signature.
@@ -1950,7 +1694,7 @@ class Type extends @type {
    * covering all cases but with less precision than the overloads.
    */
   FunctionCallSignatureType getLastFunctionSignature() {
-      result = getFunctionSignature(getNumFunctionSignature() - 1)
+    result = getFunctionSignature(getNumFunctionSignature() - 1)
   }
 
   /**
@@ -1980,9 +1724,7 @@ class Type extends @type {
   /**
    * Gets the number of constructor call signatures.
    */
-  int getNumConstructorSignature() {
-    result = count(getAConstructorSignature())
-  }
+  int getNumConstructorSignature() { result = count(getAConstructorSignature()) }
 
   /**
    * Gets the last signature of the method of the given name.
@@ -2020,8 +1762,7 @@ class Type extends @type {
    * For example, for a type `(S & T) | U` this gets the types `S`, `T`, and `U`.
    */
   Type unfold() {
-    not result instanceof UnionOrIntersectionType
-    and
+    not result instanceof UnionOrIntersectionType and
     (
       result = this
       or
@@ -2074,23 +1815,17 @@ class UnionOrIntersectionType extends Type, @unionorintersectiontype {
   /**
    * Gets the `i`th member of this union or intersection, starting at 0.
    */
-  Type getElementType(int i) {
-    result = getChild(i)
-  }
+  Type getElementType(int i) { result = getChild(i) }
 
   /**
    * Gets a member of this union or intersection.
    */
-  Type getAnElementType() {
-    result = getElementType(_)
-  }
+  Type getAnElementType() { result = getElementType(_) }
 
   /**
    * Gets the number of elements in this union or intersection.
    */
-  int getNumElementType() {
-    result = count(int i | exists(getElementType(i)))
-  }
+  int getNumElementType() { result = count(int i | exists(getElementType(i))) }
 }
 
 /**
@@ -2099,14 +1834,12 @@ class UnionOrIntersectionType extends Type, @unionorintersectiontype {
  * Note that the `boolean` type is represented as the union `true | false`,
  * but is still displayed as `boolean` in string representations.
  */
-class UnionType extends UnionOrIntersectionType, @uniontype {
-}
+class UnionType extends UnionOrIntersectionType, @uniontype { }
 
 /**
  * An intersection type, such as `T & {x: number}`.
  */
-class IntersectionType extends UnionOrIntersectionType, @intersectiontype {
-}
+class IntersectionType extends UnionOrIntersectionType, @intersectiontype { }
 
 /**
  * A type that describes a JavaScript `Array` object.
@@ -2129,31 +1862,23 @@ class ArrayType extends Type {
   /**
    * Gets the type of element in the type.
    */
-  Type getArrayElementType() {
-    result = getNumberIndexType()
-  }
+  Type getArrayElementType() { result = getNumberIndexType() }
 }
 
 /**
  * An array type such as `Array<string>`, or equivalently, `string[]`.
  */
 class PlainArrayType extends ArrayType, TypeReference {
-  PlainArrayType() {
-    hasQualifiedName("Array")
-  }
+  PlainArrayType() { hasQualifiedName("Array") }
 
-  override Type getNumberIndexType() {
-    result = getTypeArgument(0)
-  }
+  override Type getNumberIndexType() { result = getTypeArgument(0) }
 }
 
 /**
  * A read-only array type such as `ReadonlyArray<string>`.
  */
 class ReadonlyArrayType extends ArrayType, TypeReference {
-  ReadonlyArrayType() {
-    hasQualifiedName("ReadonlyArray")
-  }
+  ReadonlyArrayType() { hasQualifiedName("ReadonlyArray") }
 }
 
 /**
@@ -2163,23 +1888,17 @@ class TupleType extends ArrayType, @tupletype {
   /**
    * Gets the `i`th member of this tuple type, starting at 0.
    */
-  Type getElementType(int i) {
-    result = getChild(i)
-  }
+  Type getElementType(int i) { result = getChild(i) }
 
   /**
    * Gets a member of this tuple type.
    */
-  Type getAnElementType() {
-    result = getElementType(_)
-  }
+  Type getAnElementType() { result = getElementType(_) }
 
   /**
    * Gets the number of elements in this tuple type, including optional elements and the rest element.
    */
-  int getNumElementType() {
-    result = count(int i | exists(getElementType(i)))
-  }
+  int getNumElementType() { result = count(int i | exists(getElementType(i))) }
 
   /**
    * Gets the underlying instantiation of the `Array` type.
@@ -2187,25 +1906,19 @@ class TupleType extends ArrayType, @tupletype {
    * For example, the tuple type `[string, number]` has `Array<string | number>`
    * as its underlying array type.
    */
-  PlainArrayType getUnderlyingArrayType() {
-    result.getArrayElementType() = getArrayElementType()
-  }
+  PlainArrayType getUnderlyingArrayType() { result.getArrayElementType() = getArrayElementType() }
 
   /**
    * Gets the number of required tuple elements, that is, excluding optional and rest elements.
    *
    * For example, the minimum length of `[number, string?, ...number[]]` is 1.
    */
-  int getMinimumLength() {
-    tuple_type_min_length(this, result)
-  }
+  int getMinimumLength() { tuple_type_min_length(this, result) }
 
   /**
    * Holds if this tuple type ends with a rest element, such as `[number, ...string[]]`.
    */
-  predicate hasRestElement() {
-    tuple_type_rest(this)
-  }
+  predicate hasRestElement() { tuple_type_rest(this) }
 
   /**
    * Gets the type of the rest element, if there is one.
@@ -2220,22 +1933,22 @@ class TupleType extends ArrayType, @tupletype {
 /**
  * The predefined `any` type.
  */
-class AnyType extends Type, @anytype {}
+class AnyType extends Type, @anytype { }
 
 /**
  * The predefined `unknown` type.
  */
-class UnknownType extends Type, @unknowntype {}
+class UnknownType extends Type, @unknowntype { }
 
 /**
  * The predefined `string` type.
  */
-class StringType extends Type, @stringtype {}
+class StringType extends Type, @stringtype { }
 
 /**
  * The predefined `number` type.
  */
-class NumberType extends Type, @numbertype {}
+class NumberType extends Type, @numbertype { }
 
 /**
  * A boolean, number, or string literal type.
@@ -2254,18 +1967,10 @@ class BooleanLiteralType extends LiteralType, @booleanliteraltype {
   /**
    * Gets the boolean value represented by this type.
    */
-  boolean getValue() {
-    if this instanceof @truetype then
-      result = true
-    else
-      result = false
-  }
+  boolean getValue() { if this instanceof @truetype then result = true else result = false }
 
   override string getStringValue() {
-    if this instanceof @truetype then
-      result = "true"
-    else
-      result = "false"
+    if this instanceof @truetype then result = "true" else result = "false"
   }
 }
 
@@ -2273,32 +1978,24 @@ class BooleanLiteralType extends LiteralType, @booleanliteraltype {
  * A number literal as a static type.
  */
 class NumberLiteralType extends LiteralType, @numberliteraltype {
-  override string getStringValue() {
-    type_literal_value(this, result)
-  }
+  override string getStringValue() { type_literal_value(this, result) }
 
   /**
    * Gets the value of the literal as an integer.
    */
-  int getIntValue() {
-    result = getStringValue().toInt()
-  }
+  int getIntValue() { result = getStringValue().toInt() }
 
   /**
    * Gets the value of the literal as a floating-point value.
    */
-  float getFloatValue() {
-    result = getStringValue().toFloat()
-  }
+  float getFloatValue() { result = getStringValue().toFloat() }
 }
 
 /**
  * A string literal as a static type.
  */
 class StringLiteralType extends LiteralType, @stringliteraltype {
-  override string getStringValue() {
-    type_literal_value(this, result)
-  }
+  override string getStringValue() { type_literal_value(this, result) }
 }
 
 /**
@@ -2345,33 +2042,32 @@ class BooleanLikeType extends Type {
 /**
  * The `void` type.
  */
-class VoidType extends Type, @voidtype {}
+class VoidType extends Type, @voidtype { }
 
 /**
  * The `undefined` type.
  */
-class UndefinedType extends Type, @undefinedtype {}
+class UndefinedType extends Type, @undefinedtype { }
 
 /**
  * The `null` type.
  */
-class NullType extends Type, @nulltype {}
+class NullType extends Type, @nulltype { }
 
 /**
  * The `never` type.
  */
-class NeverType extends Type, @nevertype {}
+class NeverType extends Type, @nevertype { }
 
 /**
  * The `symbol` type or a specific `unique symbol` type.
  */
-class SymbolType extends Type, @symboltype {}
+class SymbolType extends Type, @symboltype { }
 
 /**
  * The `symbol` type.
  */
-class PlainSymbolType extends SymbolType, @plainsymboltype {
-}
+class PlainSymbolType extends SymbolType, @plainsymboltype { }
 
 /**
  * A `unique symbol` type.
@@ -2380,23 +2076,17 @@ class UniqueSymbolType extends SymbolType, @uniquesymboltype {
   /**
    * Gets the canonical name of the variable exposing the symbol.
    */
-  CanonicalName getCanonicalName() {
-    type_symbol(this, result)
-  }
+  CanonicalName getCanonicalName() { type_symbol(this, result) }
 
   /**
    * Gets the unqualified name of the variable exposing this symbol.
    */
-  string getName() {
-    result = getCanonicalName().getName()
-  }
+  string getName() { result = getCanonicalName().getName() }
 
   /**
    * Holds if the variable exposing this symbol has the given global qualified name.
    */
-  predicate hasQualifiedName(string globalName) {
-    getCanonicalName().hasQualifiedName(globalName)
-  }
+  predicate hasQualifiedName(string globalName) { getCanonicalName().hasQualifiedName(globalName) }
 
   /**
    * Holds if the variable exposing this symbol is exported from an external module under the given name.
@@ -2409,8 +2099,7 @@ class UniqueSymbolType extends SymbolType, @uniquesymboltype {
 /**
  * The `object` type.
  */
-class ObjectKeywordType extends Type, @objectkeywordtype {
-}
+class ObjectKeywordType extends Type, @objectkeywordtype { }
 
 /**
  * A type that refers to a class, interface, enum, or enum member.
@@ -2419,44 +2108,32 @@ class TypeReference extends Type, @typereference {
   /**
    * Gets the canonical name of the type being referenced.
    */
-  TypeName getTypeName() {
-    type_symbol(this, result)
-  }
+  TypeName getTypeName() { type_symbol(this, result) }
 
   /**
    * Gets a syntactic declaration of this named type.
    */
-  TypeDefinition getADefinition() {
-    result = getTypeName().getADefinition()
-  }
+  TypeDefinition getADefinition() { result = getTypeName().getADefinition() }
 
   /**
    * Gets the `n`th type argument provided in this type, such as `string` in `Promise<string>`.
    */
-  Type getTypeArgument(int n) {
-    result = getChild(n)
-  }
+  Type getTypeArgument(int n) { result = getChild(n) }
 
   /**
    * Gets a type argument provided in this type.
    */
-  Type getATypeArgument() {
-    result = getTypeArgument(_)
-  }
+  Type getATypeArgument() { result = getTypeArgument(_) }
 
   /**
    * Holds if type arguments are provided in this type.
    */
-  predicate hasTypeArguments() {
-    exists (getATypeArgument())
-  }
+  predicate hasTypeArguments() { exists(getATypeArgument()) }
 
   /**
    * Gets the number of type arguments provided in this type.
    */
-  int getNumTypeArgument() {
-    result = count(int i | exists(getTypeArgument(i)))
-  }
+  int getNumTypeArgument() { result = count(int i | exists(getTypeArgument(i))) }
 
   /**
    * Holds if the referenced type has the given qualified name, rooted in the global scope.
@@ -2464,9 +2141,7 @@ class TypeReference extends Type, @typereference {
    * For example, `type.hasQualifiedName("React.Component")` holds if `type` is an instantiation
    * of the React `Component` class.
    */
-  predicate hasQualifiedName(string globalName) {
-    getTypeName().hasQualifiedName(globalName)
-  }
+  predicate hasQualifiedName(string globalName) { getTypeName().hasQualifiedName(globalName) }
 
   /**
    * Holds if the referenced type is exported from the given module under the given qualified name.
@@ -2513,9 +2188,7 @@ class InterfaceType extends TypeReference {
 class EnumType extends TypeReference {
   EnumDeclaration declaration;
 
-  EnumType() {
-    declaration = getADefinition()
-  }
+  EnumType() { declaration = getADefinition() }
 
   /**
    * Gets the declaration of the referenced enum.
@@ -2529,9 +2202,7 @@ class EnumType extends TypeReference {
 class EnumLiteralType extends TypeReference {
   EnumMember declaration;
 
-  EnumLiteralType() {
-    declaration = getADefinition()
-  }
+  EnumLiteralType() { declaration = getADefinition() }
 
   /**
    * Gets the declaration of the referenced enum member.
@@ -2542,7 +2213,7 @@ class EnumLiteralType extends TypeReference {
 /**
  * An anonymous interface type, such as `{ x: number }`.
  */
-class AnonymousInterfaceType extends Type, @objecttype {}
+class AnonymousInterfaceType extends Type, @objecttype { }
 
 /**
  * A type that refers to a type variable.
@@ -2556,9 +2227,7 @@ class TypeVariableType extends Type, @typevariabletype {
    *
    * Some type variables have no associated declaration.
    */
-  TypeParameter getADeclaration() {
-    ast_node_type(result.getIdentifier(), this)
-  }
+  TypeParameter getADeclaration() { ast_node_type(result.getIdentifier(), this) }
 
   /**
    * Gets a declaration of the type or function declaring this type parameter.
@@ -2568,9 +2237,7 @@ class TypeVariableType extends Type, @typevariabletype {
    *
    * Some type variables have no associated host declaration.
    */
-  TypeParameterized getAHostDeclaration() {
-    result = getADeclaration().getHost()
-  }
+  TypeParameterized getAHostDeclaration() { result = getADeclaration().getHost() }
 
   /**
    * Gets the type declaring this type variable, if any.
@@ -2592,17 +2259,11 @@ class TypeVariableType extends Type, @typevariabletype {
  * A type that refers to a type variable declared on a class, interface or function.
  */
 class CanonicalTypeVariableType extends TypeVariableType, @canonicaltypevariabletype {
-  override TypeName getHostType() {
-    result = getCanonicalName().getParent()
-  }
+  override TypeName getHostType() { result = getCanonicalName().getParent() }
 
-  override CanonicalName getCanonicalName() {
-    type_symbol(this, result)
-  }
+  override CanonicalName getCanonicalName() { type_symbol(this, result) }
 
-  override string getName() {
-    result = getCanonicalName().getName()
-  }
+  override string getName() { result = getCanonicalName().getName() }
 }
 
 /**
@@ -2638,13 +2299,9 @@ class ThisType extends Type, @thistype {
   /**
    * Gets the type containing the `this` type.
    */
-  TypeReference getEnclosingType() {
-    result = getChild(0)
-  }
+  TypeReference getEnclosingType() { result = getChild(0) }
 
-  override string toString() {
-    result = getEnclosingType().getTypeName().getName() + ".this"
-  }
+  override string toString() { result = getEnclosingType().getTypeName().getName() + ".this" }
 }
 
 /**
@@ -2655,16 +2312,12 @@ class TypeofType extends Type, @typeoftype {
   /**
    * Gets the canonical name of the named value.
    */
-  CanonicalName getCanonicalName() {
-    type_symbol(this, result)
-  }
+  CanonicalName getCanonicalName() { type_symbol(this, result) }
 
   /**
    * Gets the unqualified name of `X` in `typeof X`.
    */
-  string getName() {
-    result = getCanonicalName().getName()
-  }
+  string getName() { result = getCanonicalName().getName() }
 
   /**
    * Holds if this refers to a value accessible by the global access path `globalName`.
@@ -2672,9 +2325,7 @@ class TypeofType extends Type, @typeoftype {
    * For example, `cls.hasQualifiedName("React.Component")` holds if `cls`
    * refers to the class constructor for `React.Component`.
    */
-  predicate hasQualifiedName(string globalName) {
-    getCanonicalName().hasQualifiedName(globalName)
-  }
+  predicate hasQualifiedName(string globalName) { getCanonicalName().hasQualifiedName(globalName) }
 
   /**
    * Holds if this refers to a value exported from `moduleName` under the access path `exportedName`.
@@ -2701,19 +2352,13 @@ class TypeofType extends Type, @typeoftype {
  * One of two values indicating if a signature is a function or constructor signature.
  */
 class SignatureKind extends string {
-  SignatureKind() {
-    this = "function" or this = "constructor"
-  }
+  SignatureKind() { this = "function" or this = "constructor" }
 
   /** Holds if this is the function call signature kind. */
-  predicate isFunction() {
-    this = "function"
-  }
+  predicate isFunction() { this = "function" }
 
   /** Holds if this is the constructor call signature kind. */
-  predicate isConstructor() {
-    this = "constructor"
-  }
+  predicate isConstructor() { this = "constructor" }
 
   /**
    * For internal use.
@@ -2721,13 +2366,15 @@ class SignatureKind extends string {
    * Gets the integer corresponding to this kind in the database.
    */
   int getId() {
-    this = "function" and result = 0 or
+    this = "function" and result = 0
+    or
     this = "constructor" and result = 1
   }
 }
 
 module SignatureKind {
   SignatureKind function() { result = "function" }
+
   SignatureKind constructor() { result = "constructor" }
 }
 
@@ -2738,16 +2385,12 @@ class CallSignatureType extends @signature_type {
   /**
    * Gets a value indicating if this is a function or constructor signature.
    */
-  SignatureKind getKind() {
-    signature_types(this, result.getId(), _, _, _)
-  }
+  SignatureKind getKind() { signature_types(this, result.getId(), _, _, _) }
 
   /**
    * Gets a string representation of this signature.
    */
-  string toString() {
-    signature_types(this, _, result, _, _)
-  }
+  string toString() { signature_types(this, _, result, _, _) }
 
   /**
    * Gets the `n`th type contained in this signature, that is, a parameter or return type.
@@ -2755,36 +2398,29 @@ class CallSignatureType extends @signature_type {
    * The mapping from `n` to a given child is internal and may change between
    * versions of the extractor.
    */
-  Type getChild(int n) {
-    signature_contains_type(result, this, n)
-  }
+  Type getChild(int n) { signature_contains_type(result, this, n) }
 
   /**
    * Gets a type contained in this signature, that is, the return type or a parameter type.
    */
-  Type getAChildType() {
-    result = getChild(_)
-  }
+  Type getAChildType() { result = getChild(_) }
 
   /**
    * Gets the return type of this signature.
    */
-  Type getReturnType() {
-    result = getChild(-1)
-  }
+  Type getReturnType() { result = getChild(-1) }
 
   /**
    * Gets the number of type parameters on this call signature.
    */
-  int getNumTypeParameter() {
-    signature_types(this, _, _, result, _)
-  }
+  int getNumTypeParameter() { signature_types(this, _, _, result, _) }
 
   /**
    * Gets the bound on the `n`th type parameter.
    */
   Type getTypeParameterBound(int n) {
-    n >= 0 and n < getNumTypeParameter() and
+    n >= 0 and
+    n < getNumTypeParameter() and
     result = getChild(n)
   }
 
@@ -2792,53 +2428,42 @@ class CallSignatureType extends @signature_type {
    * Gets the name of the `n`th type parameter.
    */
   string getTypeParameterName(int n) {
-    n >= 0 and n < getNumTypeParameter() and
+    n >= 0 and
+    n < getNumTypeParameter() and
     signature_parameter_name(this, n, result)
   }
 
   /**
    * Holds if this call signature declares type parameters.
    */
-  predicate hasTypeParameters() {
-    getNumTypeParameter() > 0
-  }
+  predicate hasTypeParameters() { getNumTypeParameter() > 0 }
 
   /**
    * Gets the type of the `n`th parameter of this signature.
    */
-  Type getParameter(int n) {
-    n >= 0 and result = getChild(n + getNumTypeParameter())
-  }
+  Type getParameter(int n) { n >= 0 and result = getChild(n + getNumTypeParameter()) }
 
   /**
    * Gets the type of a parameter of this signature.
    */
-  Type getAParameter() {
-    result = getParameter(_)
-  }
+  Type getAParameter() { result = getParameter(_) }
 
   /**
    * Gets the number of parameters.
    */
-  int getNumParameter() {
-    result = count(int i | exists(getParameter(i)))
-  }
+  int getNumParameter() { result = count(int i | exists(getParameter(i))) }
 
   /**
    * Gets the number of required parameters, that is,
    * parameters that are not marked as optional with the `?` suffix.
    */
-  int getNumRequiredParameter() {
-    signature_types(this, _, _, _, result)
-  }
+  int getNumRequiredParameter() { signature_types(this, _, _, _, result) }
 
   /**
    * Gets the number of optional parameters, that is,
    * parameters that are marked as optional with the `?` suffix.
    */
-  int getNumOptionalParameter() {
-    result = getNumParameter() - getNumRequiredParameter()
-  }
+  int getNumOptionalParameter() { result = getNumParameter() - getNumRequiredParameter() }
 
   /**
    * Holds if the `n`th parameter is required, that is, it is not marked as
@@ -2868,20 +2493,18 @@ class CallSignatureType extends @signature_type {
   /**
    * Gets the name of a parameter of this signature.
    */
-  string getAParameterName() {
-    result = getParameterName(_)
-  }
+  string getAParameterName() { result = getParameterName(_) }
 }
 
 /**
  * A function call signature in a type, that is, a signature without the `new` keyword.
  */
-class FunctionCallSignatureType extends CallSignatureType, @function_signature_type {}
+class FunctionCallSignatureType extends CallSignatureType, @function_signature_type { }
 
 /**
  * A constructor call signature in a type, that is, a signature with the `new` keyword.
  */
-class ConstructorCallSignatureType extends CallSignatureType, @constructor_signature_type {}
+class ConstructorCallSignatureType extends CallSignatureType, @constructor_signature_type { }
 
 /**
  * A type name that defines a promise.
@@ -2898,12 +2521,18 @@ private class PromiseTypeName extends TypeName {
       name.matches("%Promise") or
       name.matches("%PromiseLike") or
       name.matches("%Thenable") or
-      name.matches("%Deferred"))
-    and
+      name.matches("%Deferred")
+    ) and
     // The `then` method should take a callback, taking an argument of type `T`.
     exists(TypeReference self | self = getType() |
       self.getNumTypeArgument() = 1 and
-      self.getAMethodOverload("then").getParameter(0).unfold().getAFunctionSignature().getParameter(0) = self.getTypeArgument(0))
+      self
+          .getAMethodOverload("then")
+          .getParameter(0)
+          .unfold()
+          .getAFunctionSignature()
+          .getParameter(0) = self.getTypeArgument(0)
+    )
   }
 }
 
@@ -2922,7 +2551,5 @@ class PromiseType extends TypeReference {
   /**
    * Gets the content type of the promise.
    */
-  Type getElementType() {
-    result = getTypeArgument(0)
-  }
+  Type getElementType() { result = getTypeArgument(0) }
 }
diff --git a/javascript/ql/src/semmle/javascript/Util.qll b/javascript/ql/src/semmle/javascript/Util.qll
index 482b26a54fcf..1d5983d4ac62 100644
--- a/javascript/ql/src/semmle/javascript/Util.qll
+++ b/javascript/ql/src/semmle/javascript/Util.qll
@@ -1,18 +1,16 @@
-import javascript
-
 /**
  * Provides general-purpose utility predicates.
  */
 
- /**
-  * Gets the capitalization of `s`.
-  *
-  * For example, the capitalization of `"function"` is `"Function"`.
-  */
+import javascript
+
+/**
+ * Gets the capitalization of `s`.
+ *
+ * For example, the capitalization of `"function"` is `"Function"`.
+ */
 bindingset[s]
-string capitalize(string s) {
-  result = s.charAt(0).toUpperCase() + s.suffix(1)
-}
+string capitalize(string s) { result = s.charAt(0).toUpperCase() + s.suffix(1) }
 
 /**
  * Gets the pluralization for `n` occurrences of `noun`.
@@ -20,12 +18,7 @@ string capitalize(string s) {
  * For example, the pluralization of `"function"` for `n = 2` is `"functions"`.
  */
 bindingset[noun, n]
-string pluralize(string noun, int n) {
-  if n = 1 then
-    result = noun
-  else
-    result = noun + "s"
-}
+string pluralize(string noun, int n) { if n = 1 then result = noun else result = noun + "s" }
 
 /**
  * Gets `str` or a truncated version of `str` with `explanation` appended if its length exceeds `maxLength`.
@@ -41,31 +34,28 @@ string truncate(string str, int maxLength, string explanation) {
  * Gets a string that describes `e`.
  */
 string describeExpression(Expr e) {
-  if e instanceof InvokeExpr then
-    exists (string prefix, string suffix |
-      result = prefix + suffix |
-      ( if e instanceof NewExpr then
-        prefix = "constructor call"
-      else if e instanceof MethodCallExpr then
-        prefix = "method call"
-      else
-        prefix = "call"
+  if e instanceof InvokeExpr
+  then
+    exists(string prefix, string suffix | result = prefix + suffix |
+      (
+        if e instanceof NewExpr
+        then prefix = "constructor call"
+        else if e instanceof MethodCallExpr then prefix = "method call" else prefix = "call"
       ) and
       (
-        if exists(e.(InvokeExpr).getCalleeName()) then
-          suffix = " to " + e.(InvokeExpr).getCalleeName()
-        else
-          suffix = ""
+        if exists(e.(InvokeExpr).getCalleeName())
+        then suffix = " to " + e.(InvokeExpr).getCalleeName()
+        else suffix = ""
       )
     )
-  else if e instanceof Comparison then
-    result = "comparison"
-  else if e instanceof VarAccess then
-    result = "use of variable '" + e.(VarAccess).getName() + "'"
-  else if e instanceof PropAccess and exists (e.(PropAccess).getPropertyName()) then
-    result = "use of property '" + e.(PropAccess).getPropertyName() + "'"
-  else if e instanceof LogNotExpr then
-    result = "negation"
   else
-    result = "expression"
-}
\ No newline at end of file
+    if e instanceof Comparison
+    then result = "comparison"
+    else
+      if e instanceof VarAccess
+      then result = "use of variable '" + e.(VarAccess).getName() + "'"
+      else
+        if e instanceof PropAccess and exists(e.(PropAccess).getPropertyName())
+        then result = "use of property '" + e.(PropAccess).getPropertyName() + "'"
+        else if e instanceof LogNotExpr then result = "negation" else result = "expression"
+}
diff --git a/javascript/ql/src/semmle/javascript/Variables.qll b/javascript/ql/src/semmle/javascript/Variables.qll
index fd7f0d853744..cd646649708a 100644
--- a/javascript/ql/src/semmle/javascript/Variables.qll
+++ b/javascript/ql/src/semmle/javascript/Variables.qll
@@ -5,34 +5,22 @@ import javascript
 /** A scope in which variables can be declared. */
 class Scope extends @scope {
   /** Gets a textual representation of this element. */
-  string toString() {
-    none()
-  }
+  string toString() { none() }
 
   /** Gets the scope in which this scope is nested, if any. */
-  Scope getOuterScope() {
-    scopenesting(this, result)
-  }
+  Scope getOuterScope() { scopenesting(this, result) }
 
   /** Gets a scope nested in this one, if any. */
-  Scope getAnInnerScope() {
-    result.getOuterScope() = this
-  }
+  Scope getAnInnerScope() { result.getOuterScope() = this }
 
   /** Gets the program element this scope is associated with, if any. */
-  ASTNode getScopeElement() {
-    scopenodes(result, this)
-  }
+  ASTNode getScopeElement() { scopenodes(result, this) }
 
   /** Gets the location of the program element this scope is associated with, if any. */
-  Location getLocation() {
-    result = getScopeElement().getLocation()
-  }
+  Location getLocation() { result = getScopeElement().getLocation() }
 
   /** Gets a variable declared in this scope. */
-  Variable getAVariable() {
-    result.getScope() = this
-  }
+  Variable getAVariable() { result.getScope() = this }
 
   /** Gets the variable with the given name declared in this scope. */
   Variable getVariable(string name) {
@@ -47,112 +35,76 @@ class Scope extends @scope {
 class ScopeElement extends ASTNode {
   Scope s;
 
-  ScopeElement() {
-    this = s.getScopeElement()
-  }
+  ScopeElement() { this = s.getScopeElement() }
 
   /** Gets the scope induced by this element. */
-  Scope getScope() {
-    result = s
-  }
+  Scope getScope() { result = s }
 }
 
 /** The global scope. */
 class GlobalScope extends Scope, @globalscope {
-  override string toString() {
-    result = "global scope"
-  }
+  override string toString() { result = "global scope" }
 }
 
 /** A local scope, that is, a scope that is not the global scope. */
-class LocalScope extends Scope {
-  LocalScope() { not this instanceof GlobalScope }
-}
+class LocalScope extends Scope { LocalScope() { not this instanceof GlobalScope } }
 
 /**
  * A scope induced by a Node.js or ES2015 module
  */
 class ModuleScope extends Scope, @modulescope {
   /** Gets the module that induces this scope. */
-  Module getModule() {
-    result = getScopeElement()
-  }
+  Module getModule() { result = getScopeElement() }
 
-  override string toString() {
-    result = "module scope"
-  }
+  override string toString() { result = "module scope" }
 }
 
 /** A scope induced by a function. */
 class FunctionScope extends Scope, @functionscope {
   /** Gets the function that induces this scope. */
-  Function getFunction() {
-    result = getScopeElement()
-  }
+  Function getFunction() { result = getScopeElement() }
 
-  override string toString() {
-    result = "function scope"
-  }
+  override string toString() { result = "function scope" }
 }
 
 /** A scope induced by a catch clause. */
 class CatchScope extends Scope, @catchscope {
   /** Gets the catch clause that induces this scope. */
-  CatchClause getCatchClause() {
-    result = getScopeElement()
-  }
+  CatchClause getCatchClause() { result = getScopeElement() }
 
-  override string toString() {
-    result = "catch scope"
-  }
+  override string toString() { result = "catch scope" }
 }
 
 /** A scope induced by a block of statements. */
 class BlockScope extends Scope, @blockscope {
   /** Gets the block of statements that induces this scope. */
-  BlockStmt getBlock() {
-    result = getScopeElement()
-  }
+  BlockStmt getBlock() { result = getScopeElement() }
 
-  override string toString() {
-    result = "block scope"
-  }
+  override string toString() { result = "block scope" }
 }
 
 /** A scope induced by a `for` statement. */
 class ForScope extends Scope, @forscope {
   /** Gets the `for` statement that induces this scope. */
-  ForStmt getLoop() {
-    result = getScopeElement()
-  }
+  ForStmt getLoop() { result = getScopeElement() }
 
-  override string toString() {
-    result = "for scope"
-  }
+  override string toString() { result = "for scope" }
 }
 
 /** A scope induced by a `for`-`in` or `for`-`of` statement. */
 class ForInScope extends Scope, @forinscope {
   /** Gets the `for`-`in` or `for`-`of` statement that induces this scope. */
-  EnhancedForLoop getLoop() {
-    result = getScopeElement()
-  }
+  EnhancedForLoop getLoop() { result = getScopeElement() }
 
-  override string toString() {
-    result = "for-in scope"
-  }
+  override string toString() { result = "for-in scope" }
 }
 
 /** A scope induced by a comprehension block. */
 class ComprehensionBlockScope extends Scope, @comprehensionblockscope {
   /** Gets the comprehension block that induces this scope. */
-  ComprehensionBlock getComprehensionBlock() {
-    result = getScopeElement()
-  }
+  ComprehensionBlock getComprehensionBlock() { result = getScopeElement() }
 
-  override string toString() {
-    result = "comprehension block scope"
-  }
+  override string toString() { result = "comprehension block scope" }
 }
 
 /**
@@ -163,27 +115,19 @@ class ComprehensionBlockScope extends Scope, @comprehensionblockscope {
  * of the same namespace.
  */
 class NamespaceScope extends Scope, @namespacescope {
-  override string toString() {
-    result = "namespace scope"
-  }
+  override string toString() { result = "namespace scope" }
 }
 
 /** A variable declared in a scope. */
 class Variable extends @variable, LexicalName {
   /** Gets the name of this variable. */
-  override string getName() {
-    variables(this, result, _)
-  }
+  override string getName() { variables(this, result, _) }
 
   /** Gets the scope this variable is declared in. */
-  override Scope getScope() {
-    variables(this, _, result)
-  }
+  override Scope getScope() { variables(this, _, result) }
 
   /** Holds if this is a global variable. */
-  predicate isGlobal() {
-    getScope() instanceof GlobalScope
-  }
+  predicate isGlobal() { getScope() instanceof GlobalScope }
 
   /**
    * Holds if this is a variable exported from a TypeScript namespace.
@@ -192,7 +136,7 @@ class Variable extends @variable, LexicalName {
    */
   predicate isNamespaceExport() {
     getScope() instanceof NamespaceScope and
-    exists (ExportNamedDeclaration decl | decl.getADecl().getVariable() = this)
+    exists(ExportNamedDeclaration decl | decl.getADecl().getVariable() = this)
   }
 
   /**
@@ -200,29 +144,19 @@ class Variable extends @variable, LexicalName {
    *
    * Parameters and `arguments` variables are considered to be local.
    */
-  predicate isLocal() {
-    not isGlobal()
-  }
+  predicate isLocal() { not isGlobal() }
 
   /** Holds if this variable is a parameter. */
-  predicate isParameter() {
-    exists (Parameter p | p.getAVariable() = this)
-  }
+  predicate isParameter() { exists(Parameter p | p.getAVariable() = this) }
 
   /** Gets a reference to this variable. */
-  VarRef getAReference() {
-    result.getVariable() = this
-  }
+  VarRef getAReference() { result.getVariable() = this }
 
   /** Gets an access to this variable. */
-  VarAccess getAnAccess() {
-    result.getVariable() = this
-  }
+  VarAccess getAnAccess() { result.getVariable() = this }
 
   /** Gets a declaration declaring this variable, if any. */
-  VarDecl getADeclaration() {
-    result.getVariable() = this
-  }
+  VarDecl getADeclaration() { result.getVariable() = this }
 
   /** Gets a declaration statement declaring this variable, if any. */
   DeclStmt getADeclarationStatement() {
@@ -230,21 +164,20 @@ class Variable extends @variable, LexicalName {
   }
 
   /** Gets a definition for this variable. */
-  VarDef getADefinition() {
-    result.getAVariable() = this
-  }
+  VarDef getADefinition() { result.getAVariable() = this }
 
   /** Gets an expression that is directly stored in this variable. */
   Expr getAnAssignedExpr() {
     // result is an expression that this variable is initialized to
-    exists (VariableDeclarator vd |
-      vd.getBindingPattern().(VarDecl).getVariable() = this |
+    exists(VariableDeclarator vd | vd.getBindingPattern().(VarDecl).getVariable() = this |
       result = vd.getInit()
-    ) or
+    )
+    or
     // if this variable represents a function binding, return the function
-    exists (FunctionExpr fn | fn.getVariable() = this | result = fn) or
+    exists(FunctionExpr fn | fn.getVariable() = this | result = fn)
+    or
     // there is an assignment to this variable
-    exists (Assignment assgn | assgn.getLhs() = getAnAccess() and assgn.getRhs() = result)
+    exists(Assignment assgn | assgn.getLhs() = getAnAccess() and assgn.getRhs() = result)
   }
 
   /**
@@ -254,38 +187,29 @@ class Variable extends @variable, LexicalName {
    */
   predicate isCaptured() {
     this instanceof GlobalVariable or
-    getAnAccess().getContainer().getFunctionBoundary() != this.(LocalVariable).getDeclaringContainer().getFunctionBoundary()
+    getAnAccess().getContainer().getFunctionBoundary() != this
+          .(LocalVariable)
+          .getDeclaringContainer()
+          .getFunctionBoundary()
   }
 
   /** Holds if there is a declaration of this variable in `tl`. */
-  predicate declaredIn(TopLevel tl) {
-    getADeclaration().getTopLevel() = tl
-  }
+  predicate declaredIn(TopLevel tl) { getADeclaration().getTopLevel() = tl }
 
   /** Gets a textual representation of this element. */
-  override string toString() {
-    result = getName()
-  }
+  override string toString() { result = getName() }
 
-  override DeclarationSpace getDeclarationSpace() {
-      result = "variable"
-  }
+  override DeclarationSpace getDeclarationSpace() { result = "variable" }
 }
 
 /** An `arguments` variable of a function. */
 class ArgumentsVariable extends Variable {
-  ArgumentsVariable() {
-    isArgumentsObject(this)
-  }
+  ArgumentsVariable() { isArgumentsObject(this) }
 
-  override FunctionScope getScope() {
-    result = Variable.super.getScope()
-  }
+  override FunctionScope getScope() { result = Variable.super.getScope() }
 
   /** Gets the function declaring this 'arguments' variable. */
-  Function getFunction() {
-    result = getScope().getFunction()
-  }
+  Function getFunction() { result = getScope().getFunction() }
 }
 
 /** An identifier that refers to a variable, either in a declaration or in a variable access. */
@@ -299,10 +223,7 @@ class VarRef extends @varref, Identifier, BindingPattern, LexicalRef {
 
   override predicate isImpure() { none() }
 
-  override Expr getUnderlyingReference() {
-    result = this
-  }
-
+  override Expr getUnderlyingReference() { result = this }
 }
 
 /** An identifier that refers to a variable in a non-declaring position. */
@@ -313,20 +234,19 @@ class VarAccess extends @varaccess, VarRef, LexicalAccess {
    * When analyzing TypeScript code, a variable may spuriously be resolved as a
    * global due to incomplete modeling of exported variables in namespaces.
    */
-  override Variable getVariable() {
-    bind(this, result)
-  }
+  override Variable getVariable() { bind(this, result) }
 
   override predicate isLValue() {
-    exists (Assignment assgn | assgn.getTarget() = this) or
-    exists (UpdateExpr upd | upd.getOperand().getUnderlyingReference() = this) or
-    exists (EnhancedForLoop efl | efl.getIterator() = this) or
-    exists (BindingPattern p | this = p.getABindingVarRef() and p.isLValue())
+    exists(Assignment assgn | assgn.getTarget() = this)
+    or
+    exists(UpdateExpr upd | upd.getOperand().getUnderlyingReference() = this)
+    or
+    exists(EnhancedForLoop efl | efl.getIterator() = this)
+    or
+    exists(BindingPattern p | this = p.getABindingVarRef() and p.isLValue())
   }
 
-  override Variable getAVariable() {
-    result = getVariable()
-  }
+  override Variable getAVariable() { result = getVariable() }
 }
 
 /**
@@ -336,28 +256,18 @@ class VarAccess extends @varaccess, VarRef, LexicalAccess {
  */
 class ExportVarAccess extends VarAccess, @export_varaccess {
   /** Gets the type being exported, if this identifier refers to a type. */
-  LocalTypeName getLocalTypeName() {
-    result.getAnAccess() = this
-  }
+  LocalTypeName getLocalTypeName() { result.getAnAccess() = this }
 
   /** Gets the namespace being exported, if this identifier refers to a namespace. */
-  LocalNamespaceName getLocalNamespaceName() {
-    result.getAnAccess() = this
-  }
+  LocalNamespaceName getLocalNamespaceName() { result.getAnAccess() = this }
 }
 
 /** A global variable. */
-class GlobalVariable extends Variable {
-  GlobalVariable() {
-    isGlobal()
-  }
-}
+class GlobalVariable extends Variable { GlobalVariable() { isGlobal() } }
 
 /** A local variable or a parameter. */
 class LocalVariable extends Variable {
-  LocalVariable() {
-    isLocal()
-  }
+  LocalVariable() { isLocal() }
 
   /**
    * Gets the function or toplevel in which this variable is declared;
@@ -369,31 +279,21 @@ class LocalVariable extends Variable {
    * it is declared in the enclosing container.
    */
   StmtContainer getDeclaringContainer() {
-    this = result.getScope().getAVariable() or
-    exists (VarDecl d | d = getADeclaration() |
-      if d = any(FunctionDeclStmt fds).getId() then
-        exists (FunctionDeclStmt fds | d = fds.getId() |
-          result = fds.getEnclosingContainer()
-        )
-      else
-        result = d.getContainer()
+    this = result.getScope().getAVariable()
+    or
+    exists(VarDecl d | d = getADeclaration() |
+      if d = any(FunctionDeclStmt fds).getId()
+      then exists(FunctionDeclStmt fds | d = fds.getId() | result = fds.getEnclosingContainer())
+      else result = d.getContainer()
     )
   }
 }
 
 /** A local variable that is not captured. */
-class PurelyLocalVariable extends LocalVariable {
-  PurelyLocalVariable() {
-    not isCaptured()
-  }
-}
+class PurelyLocalVariable extends LocalVariable { PurelyLocalVariable() { not isCaptured() } }
 
 /** An identifier that refers to a global variable. */
-class GlobalVarAccess extends VarAccess {
-  GlobalVarAccess() {
-    getVariable().isGlobal()
-  }
-}
+class GlobalVarAccess extends VarAccess { GlobalVarAccess() { getVariable().isGlobal() } }
 
 /**
  * A binding pattern, i.e., either an identifier or a destructuring pattern.
@@ -415,9 +315,7 @@ class BindingPattern extends @pattern, Expr {
   Variable getAVariable() { result = getABindingVarRef().getVariable() }
 
   /** Holds if this pattern appears in an l-value position. */
-  predicate isLValue() {
-    any()
-  }
+  predicate isLValue() { any() }
 
   /**
    * Returns the TypeScript type annotation for this variable or pattern, if any.
@@ -431,7 +329,9 @@ class BindingPattern extends @pattern, Expr {
    * annotation `Point`.
    */
   TypeExpr getTypeAnnotation() {
-    exists (VariableDeclarator decl | decl.getBindingPattern() = this | result = decl.getTypeAnnotation())
+    exists(VariableDeclarator decl | decl.getBindingPattern() = this |
+      result = decl.getTypeAnnotation()
+    )
     // note: Parameter overrides this to handle the parameter case
   }
 }
@@ -444,25 +344,20 @@ abstract class DestructuringPattern extends BindingPattern {
 
 /** An identifier that declares a variable. */
 class VarDecl extends @vardecl, VarRef, LexicalDecl {
-  override Variable getVariable() {
-    decl(this, result)
-  }
+  override Variable getVariable() { decl(this, result) }
 
   override predicate isLValue() {
-    exists (VariableDeclarator vd | vd.getBindingPattern() = this |
-      exists (vd.getInit()) or
-      exists (EnhancedForLoop efl | this = efl.getIterator())
-    ) or
-    exists (BindingPattern p | this = p.getABindingVarRef() and p.isLValue())
+    exists(VariableDeclarator vd | vd.getBindingPattern() = this |
+      exists(vd.getInit()) or
+      exists(EnhancedForLoop efl | this = efl.getIterator())
+    )
+    or
+    exists(BindingPattern p | this = p.getABindingVarRef() and p.isLValue())
   }
 }
 
 /** An identifier that declares a global variable. */
-class GlobalVarDecl extends VarDecl {
-  GlobalVarDecl() {
-    getVariable() instanceof GlobalVariable
-  }
-}
+class GlobalVarDecl extends VarDecl { GlobalVarDecl() { getVariable() instanceof GlobalVariable } }
 
 /** An array pattern. */
 class ArrayPattern extends DestructuringPattern, @arraypattern {
@@ -473,50 +368,36 @@ class ArrayPattern extends DestructuringPattern, @arraypattern {
   }
 
   /** Gets an element of this array pattern. */
-  Expr getAnElement() {
-    exists (int i | i >= -1 | result = this.getChildExpr(i))
-  }
+  Expr getAnElement() { exists(int i | i >= -1 | result = this.getChildExpr(i)) }
 
   /** Gets the default expression for the `i`th element of this array pattern, if any. */
   Expr getDefault(int i) {
-    i in [0..getSize()-1] and
+    i in [0 .. getSize() - 1] and
     result = getChildExpr(-2 - i)
   }
 
   /** Holds if the `i`th element of this array pattern has a default expression. */
-  predicate hasDefault(int i) {
-    exists(getDefault(i))
-  }
+  predicate hasDefault(int i) { exists(getDefault(i)) }
 
   /** Gets the rest pattern of this array pattern, if any. */
-  override Expr getRest() {
-    result = getChildExpr(-1)
-  }
+  override Expr getRest() { result = getChildExpr(-1) }
 
   /** Holds if this array pattern has a rest pattern. */
-  predicate hasRest() {
-    exists(getRest())
-  }
+  predicate hasRest() { exists(getRest()) }
 
   /** Gets the number of elements in this array pattern, not including any rest pattern. */
-  int getSize() {
-    arraySize(this, result)
-  }
+  int getSize() { arraySize(this, result) }
 
   /** Holds if the `i`th element of this array pattern is omitted. */
   predicate elementIsOmitted(int i) {
-    i in [0..getSize()-1] and
-    not exists (getElement(i))
+    i in [0 .. getSize() - 1] and
+    not exists(getElement(i))
   }
 
   /** Holds if this array pattern has an omitted element. */
-  predicate hasOmittedElement() {
-    elementIsOmitted(_)
-  }
+  predicate hasOmittedElement() { elementIsOmitted(_) }
 
-  override predicate isImpure() {
-    getAnElement().isImpure()
-  }
+  override predicate isImpure() { getAnElement().isImpure() }
 
   override VarRef getABindingVarRef() {
     result = getAnElement().(BindingPattern).getABindingVarRef()
@@ -526,19 +407,13 @@ class ArrayPattern extends DestructuringPattern, @arraypattern {
 /** An object pattern. */
 class ObjectPattern extends DestructuringPattern, @objectpattern {
   /** Gets the `i`th property pattern in this object pattern. */
-  PropertyPattern getPropertyPattern(int i) {
-    properties(result, this, i, _, _)
-  }
+  PropertyPattern getPropertyPattern(int i) { properties(result, this, i, _, _) }
 
   /** Gets a property pattern in this object pattern. */
-  PropertyPattern getAPropertyPattern() {
-    result = this.getPropertyPattern(_)
-  }
+  PropertyPattern getAPropertyPattern() { result = this.getPropertyPattern(_) }
 
   /** Gets the number of property patterns in this object pattern. */
-  int getNumProperty() {
-    result = count(this.getAPropertyPattern())
-  }
+  int getNumProperty() { result = count(this.getAPropertyPattern()) }
 
   /** Gets the property pattern with the given name, if any. */
   PropertyPattern getPropertyPatternByName(string name) {
@@ -547,13 +422,9 @@ class ObjectPattern extends DestructuringPattern, @objectpattern {
   }
 
   /** Gets the rest property pattern of this object pattern, if any. */
-  override Expr getRest() {
-    result = getChildExpr(-1)
-  }
+  override Expr getRest() { result = getChildExpr(-1) }
 
-  override predicate isImpure() {
-    getAPropertyPattern().isImpure()
-  }
+  override predicate isImpure() { getAPropertyPattern().isImpure() }
 
   override VarRef getABindingVarRef() {
     result = getAPropertyPattern().getValuePattern().(BindingPattern).getABindingVarRef() or
@@ -565,60 +436,48 @@ class ObjectPattern extends DestructuringPattern, @objectpattern {
 class PropertyPattern extends @property, ASTNode {
   PropertyPattern() {
     // filter out ordinary properties
-    exists (ObjectPattern obj | properties(this, obj, _, _, _))
+    exists(ObjectPattern obj | properties(this, obj, _, _, _))
   }
 
   /** Holds if the name of this property pattern is computed. */
-  predicate isComputed() {
-    isComputed(this)
-  }
+  predicate isComputed() { isComputed(this) }
 
   /** Gets the expression specifying the name of the matched property. */
-  Expr getNameExpr() {
-    result = this.getChildExpr(0)
-  }
+  Expr getNameExpr() { result = this.getChildExpr(0) }
 
   /** Gets the expression the matched property value is assigned to. */
-  Expr getValuePattern() {
-    result = this.getChildExpr(1)
-  }
+  Expr getValuePattern() { result = this.getChildExpr(1) }
 
   /** Gets the default value of this property pattern, if any. */
-  Expr getDefault() {
-    result = this.getChildExpr(2)
-  }
+  Expr getDefault() { result = this.getChildExpr(2) }
 
   /** Holds if this property pattern is a shorthand pattern. */
-  predicate isShorthand() {
-    getNameExpr().getLocation() = getValuePattern().getLocation()
-  }
+  predicate isShorthand() { getNameExpr().getLocation() = getValuePattern().getLocation() }
 
   /** Gets the name of the property matched by this pattern. */
   string getName() {
-    (not isComputed() and
-     result = ((Identifier)getNameExpr()).getName()) or
-    result = ((Literal)getNameExpr()).getValue()
+    (
+      not isComputed() and
+      result = (getNameExpr().(Identifier)).getName()
+    )
+    or
+    result = (getNameExpr().(Literal)).getValue()
   }
 
   /** Gets the object pattern this property pattern belongs to. */
-  ObjectPattern getObjectPattern() {
-    properties(this, result, _, _, _)
-  }
+  ObjectPattern getObjectPattern() { properties(this, result, _, _, _) }
 
   /** Gets the nearest enclosing function or toplevel in which this property pattern occurs. */
-  StmtContainer getContainer() {
-    result = getObjectPattern().getContainer()
-  }
+  StmtContainer getContainer() { result = getObjectPattern().getContainer() }
 
   /** Holds if this pattern is impure, that is, if its evaluation could have side effects. */
   predicate isImpure() {
-    (isComputed() and getNameExpr().isImpure()) or
+    (isComputed() and getNameExpr().isImpure())
+    or
     getValuePattern().isImpure()
   }
 
-  override string toString() {
-    properties(this, _, _, _, result)
-  }
+  override string toString() { properties(this, _, _, _, result) }
 
   override ControlFlowNode getFirstControlFlowNode() {
     result = getNameExpr().getFirstControlFlowNode()
@@ -628,29 +487,19 @@ class PropertyPattern extends @property, ASTNode {
 /** A variable declarator declaring a local or global variable. */
 class VariableDeclarator extends Expr, @vardeclarator {
   /** Gets the pattern specifying the declared variable(s). */
-  BindingPattern getBindingPattern() {
-    result = this.getChildExpr(0)
-  }
+  BindingPattern getBindingPattern() { result = this.getChildExpr(0) }
 
   /** Gets the expression specifying the initial value of the declared variable(s), if any. */
-  Expr getInit() {
-    result = this.getChildExpr(1)
-  }
+  Expr getInit() { result = this.getChildExpr(1) }
 
   /** Gets the TypeScript type annotation for the declared variable or binding pattern. */
-  TypeExpr getTypeAnnotation() {
-    result = this.getChildTypeExpr(2)
-  }
+  TypeExpr getTypeAnnotation() { result = this.getChildTypeExpr(2) }
 
   /** Holds if this is a TypeScript variable marked as definitely assigned with the `!` operator. */
-  predicate hasDefiniteAssignmentAssertion() {
-    hasDefiniteAssignmentAssertion(this)
-  }
+  predicate hasDefiniteAssignmentAssertion() { hasDefiniteAssignmentAssertion(this) }
 
   /** Gets the declaration statement this declarator belongs to, if any. */
-  DeclStmt getDeclStmt() {
-    this = result.getADecl()
-  }
+  DeclStmt getDeclStmt() { this = result.getADecl() }
 
   override ControlFlowNode getFirstControlFlowNode() {
     result = getBindingPattern().getFirstControlFlowNode()
@@ -661,9 +510,7 @@ class VariableDeclarator extends Expr, @vardeclarator {
  * For internal use, holding the decorators of a function parameter.
  */
 private class DecoratorList extends Expr, @decorator_list {
-  Decorator getDecorator(int i) {
-    result = getChildExpr(i)
-  }
+  Decorator getDecorator(int i) { result = getChildExpr(i) }
 
   override ControlFlowNode getFirstControlFlowNode() {
     if exists(getDecorator(0))
@@ -678,14 +525,10 @@ private class DecoratorList extends Expr, @decorator_list {
  */
 class Parameterized extends @parameterized, Documentable {
   /** Gets a parameter declared by this element. */
-  Parameter getAParameter() {
-    this = result.getParent()
-  }
+  Parameter getAParameter() { this = result.getParent() }
 
   /** Gets the number of parameters declared by this element. */
-  int getNumParameter() {
-    result = count(getAParameter())
-  }
+  int getNumParameter() { result = count(getAParameter()) }
 
   /** Gets a variable of the given name that is a parameter of this element. */
   Variable getParameterVariable(string name) {
@@ -697,7 +540,7 @@ class Parameterized extends @parameterized, Documentable {
 /** A parameter declaration. */
 class Parameter extends BindingPattern {
   Parameter() {
-    exists (Parameterized p, int n |
+    exists(Parameterized p, int n |
       this = p.getChildExpr(n) and
       n >= 0
     )
@@ -707,55 +550,43 @@ class Parameter extends BindingPattern {
    * Gets the index of this parameter within the parameter list of its
    * declaring entity.
    */
-  int getIndex() {
-    exists (Parameterized p | this = p.getChildExpr(result))
-  }
+  int getIndex() { exists(Parameterized p | this = p.getChildExpr(result)) }
 
   /** Gets the element declaring this parameter. */
-  override Parameterized getParent() {
-    result = super.getParent()
-  }
+  override Parameterized getParent() { result = super.getParent() }
 
   /** Gets the default expression for this parameter, if any. */
   Expr getDefault() {
-    exists (Function f, int n | this = f.getParameter(n) | result = f.getChildExpr(-(4*n + 5)))
+    exists(Function f, int n | this = f.getParameter(n) | result = f.getChildExpr(-(4 * n + 5)))
   }
 
   /** Gets the type annotation for this parameter, if any. */
   override TypeExpr getTypeAnnotation() {
-    exists (Function f, int n | this = f.getParameter(n) | result = f.getChildTypeExpr(-(4*n + 6)))
+    exists(Function f, int n | this = f.getParameter(n) | result = f.getChildTypeExpr(-(4 * n + 6)))
   }
 
   /** Holds if this parameter is a rest parameter. */
   predicate isRestParameter() {
-    exists (Function f, int n | this = f.getParameter(n) |
-      n = f.getNumParameter()-1 and
+    exists(Function f, int n | this = f.getParameter(n) |
+      n = f.getNumParameter() - 1 and
       f.hasRestParameter()
     )
   }
 
   private DecoratorList getDecoratorList() {
-    exists (Function f, int n | this = f.getParameter(n) | result = f.getChildExpr(-(4*n + 8)))
+    exists(Function f, int n | this = f.getParameter(n) | result = f.getChildExpr(-(4 * n + 8)))
   }
 
   /** Gets the `i`th decorator applied to this parameter. */
-  Decorator getDecorator(int i) {
-    result = getDecoratorList().getDecorator(i)
-  }
+  Decorator getDecorator(int i) { result = getDecoratorList().getDecorator(i) }
 
   /** Gets a decorator applied to this parameter. */
-  Decorator getADecorator() {
-    result = getDecorator(_)
-  }
+  Decorator getADecorator() { result = getDecorator(_) }
 
   /** Gets the number of decorators applied to this parameter. */
-  int getNumDecorator() {
-    result = count(getADecorator())
-  }
+  int getNumDecorator() { result = count(getADecorator()) }
 
-  override predicate isLValue() {
-    any()
-  }
+  override predicate isLValue() { any() }
 }
 
 /** A parameter declaration that is not an object or array pattern. */
@@ -767,7 +598,7 @@ class SimpleParameter extends Parameter, VarDecl {
    * passed in from the caller.
    */
   VarUse getAnInitialUse() {
-    exists (SsaDefinition ssa |
+    exists(SsaDefinition ssa |
       ssa.getAContributingVarDef() = this and
       result = ssa.getVariable().getAUse()
     )
@@ -783,9 +614,7 @@ class SimpleParameter extends Parameter, VarDecl {
  * ```
  */
 class FieldParameter extends SimpleParameter {
-  FieldParameter() {
-    exists (ParameterField field | field.getParameter() = this)
-  }
+  FieldParameter() { exists(ParameterField field | field.getParameter() = this) }
 
   /** Gets the field induced by this parameter. */
   ParameterField getField() { result.getParameter() = this }
@@ -795,9 +624,7 @@ class FieldParameter extends SimpleParameter {
  * A string representing one of the three TypeScript declaration spaces: `variable`, `type`, or `namespace`.
  */
 class DeclarationSpace extends string {
-  DeclarationSpace() {
-    this = "variable" or this = "type" or this = "namespace"
-  }
+  DeclarationSpace() { this = "variable" or this = "type" or this = "namespace" }
 }
 
 /**
@@ -846,10 +673,10 @@ class LexicalRef extends Identifier, @lexical_ref {
 /**
  * An identifier that declares a variable, type, or namespace, or a combination of these.
  */
-class LexicalDecl extends LexicalRef, @lexical_decl {}
+class LexicalDecl extends LexicalRef, @lexical_decl { }
 
 /**
  * An identifier that refers to a variable, type, or namespace, or a combination of these,
  * in a non-declaring position.
  */
-class LexicalAccess extends LexicalRef, @lexical_access {}
+class LexicalAccess extends LexicalRef, @lexical_access { }
diff --git a/javascript/ql/src/semmle/javascript/XML.qll b/javascript/ql/src/semmle/javascript/XML.qll
index bc7e8f2aaa2a..9d0c71334894 100755
--- a/javascript/ql/src/semmle/javascript/XML.qll
+++ b/javascript/ql/src/semmle/javascript/XML.qll
@@ -7,7 +7,7 @@ import javascript
 /** An XML element that has a location. */
 abstract class XMLLocatable extends @xmllocatable {
   /** Gets the source location for this element. */
-  Location getLocation() { xmllocations(this,result) }
+  Location getLocation() { xmllocations(this, result) }
 
   /**
    * Holds if this element is at the specified location.
@@ -16,9 +16,11 @@ abstract class XMLLocatable extends @xmllocatable {
    * For more information, see
    * [LGTM locations](https://lgtm.com/help/ql/locations).
    */
-  predicate hasLocationInfo(string filepath, int startline, int startcolumn, int endline, int endcolumn) {
+  predicate hasLocationInfo(
+    string filepath, int startline, int startcolumn, int endline, int endcolumn
+  ) {
     exists(File f, Location l | l = this.getLocation() |
-      locations_default(l,f,startline,startcolumn,endline,endcolumn) and
+      locations_default(l, f, startline, startcolumn, endline, endcolumn) and
       filepath = f.getAbsolutePath()
     )
   }
@@ -39,35 +41,31 @@ class XMLParent extends @xmlparent {
   abstract string getName();
 
   /** Gets the file to which this XML parent belongs. */
-  XMLFile getFile() { result = this or xmlElements(this,_,_,_,result) }
+  XMLFile getFile() { result = this or xmlElements(this, _, _, _, result) }
 
   /** Gets the child element at a specified index of this XML parent. */
   XMLElement getChild(int index) { xmlElements(result, _, this, index, _) }
 
   /** Gets a child element of this XML parent. */
-  XMLElement getAChild() { xmlElements(result,_,this,_,_) }
+  XMLElement getAChild() { xmlElements(result, _, this, _, _) }
 
   /** Gets a child element of this XML parent with the given `name`. */
-  XMLElement getAChild(string name) { xmlElements(result,_,this,_,_) and result.hasName(name) }
+  XMLElement getAChild(string name) { xmlElements(result, _, this, _, _) and result.hasName(name) }
 
   /** Gets a comment that is a child of this XML parent. */
-  XMLComment getAComment() { xmlComments(result,_,this,_) }
+  XMLComment getAComment() { xmlComments(result, _, this, _) }
 
   /** Gets a character sequence that is a child of this XML parent. */
-  XMLCharacters getACharactersSet() { xmlChars(result,_,this,_,_,_)  }
+  XMLCharacters getACharactersSet() { xmlChars(result, _, this, _, _, _) }
 
   /** Gets the depth in the tree. (Overridden in XMLElement.) */
   int getDepth() { result = 0 }
 
   /** Gets the number of child XML elements of this XML parent. */
-  int getNumberOfChildren() {
-    result = count(XMLElement e | xmlElements(e,_,this,_,_))
-  }
+  int getNumberOfChildren() { result = count(XMLElement e | xmlElements(e, _, this, _, _)) }
 
   /** Gets the number of places in the body of this XML parent where text occurs. */
-  int getNumberOfCharacterSets() {
-    result = count(int pos | xmlChars(_,_,this,pos,_,_))
-  }
+  int getNumberOfCharacterSets() { result = count(int pos | xmlChars(_, _, this, pos, _, _)) }
 
   /**
    * DEPRECATED: Internal.
@@ -75,22 +73,30 @@ class XMLParent extends @xmlparent {
    * Append the character sequences of this XML parent from left to right, separated by a space,
    * up to a specified (zero-based) index.
    */
-  deprecated
-  string charsSetUpTo(int n) {
-    (n = 0 and xmlChars(_,result,this,0,_,_)) or
-    (n > 0 and exists(string chars | xmlChars(_,chars,this,n,_,_) |
-                         result = this.charsSetUpTo(n-1) + " " + chars))
+  deprecated string charsSetUpTo(int n) {
+    (n = 0 and xmlChars(_, result, this, 0, _, _))
+    or
+    (
+      n > 0 and
+      exists(string chars | xmlChars(_, chars, this, n, _, _) |
+        result = this.charsSetUpTo(n - 1) + " " + chars
+      )
+    )
   }
 
   /** Append all the character sequences of this XML parent from left to right, separated by a space. */
   string allCharactersString() {
-    result = concat(string chars, int pos | xmlChars(_, chars, this, pos, _, _) | chars, " " order by pos)
+    result = concat(string chars, int pos |
+        xmlChars(_, chars, this, pos, _, _)
+      |
+        chars, " "
+        order by
+          pos
+      )
   }
 
   /** Gets the text value contained in this XML parent. */
-  string getTextValue() {
-    result = allCharactersString()
-  }
+  string getTextValue() { result = allCharactersString() }
 
   /** Gets a printable representation of this XML parent. */
   string toString() { result = this.getName() }
@@ -98,57 +104,55 @@ class XMLParent extends @xmlparent {
 
 /** An XML file. */
 class XMLFile extends XMLParent, File {
-  XMLFile() {
-    xmlEncoding(this,_)
-  }
+  XMLFile() { xmlEncoding(this, _) }
 
   /** Gets a printable representation of this XML file. */
-  override
-  string toString() { result = XMLParent.super.toString() }
+  override string toString() { result = XMLParent.super.toString() }
 
   /** Gets the name of this XML file. */
-  override
-  string getName() { result = File.super.getAbsolutePath() }
+  override string getName() { result = File.super.getAbsolutePath() }
 
   /** Gets the encoding of this XML file. */
-  string getEncoding() { xmlEncoding(this,result) }
+  string getEncoding() { xmlEncoding(this, result) }
 
   /** Gets the XML file itself. */
-  override
-  XMLFile getFile() { result = this }
+  override XMLFile getFile() { result = this }
 
   /** Gets a top-most element in an XML file. */
   XMLElement getARootElement() { result = this.getAChild() }
 
   /** Gets a DTD associated with this XML file. */
-  XMLDTD getADTD() { xmlDTDs(result,_,_,_,this) }
+  XMLDTD getADTD() { xmlDTDs(result, _, _, _, this) }
 }
 
 /** A "Document Type Definition" of an XML file. */
 class XMLDTD extends @xmldtd {
   /** Gets the name of the root element of this DTD. */
-  string getRoot() { xmlDTDs(this,result,_,_,_) }
+  string getRoot() { xmlDTDs(this, result, _, _, _) }
 
   /** Gets the public ID of this DTD. */
-  string getPublicId() { xmlDTDs(this,_,result,_,_) }
+  string getPublicId() { xmlDTDs(this, _, result, _, _) }
 
   /** Gets the system ID of this DTD. */
-  string getSystemId() { xmlDTDs(this,_,_,result,_) }
+  string getSystemId() { xmlDTDs(this, _, _, result, _) }
 
   /** Holds if this DTD is public. */
-  predicate isPublic() { not xmlDTDs(this,_,"",_,_) }
+  predicate isPublic() { not xmlDTDs(this, _, "", _, _) }
 
   /** Gets the parent of this DTD. */
-  XMLParent getParent() { xmlDTDs(this,_,_,_,result) }
+  XMLParent getParent() { xmlDTDs(this, _, _, _, result) }
 
   /** Gets a printable representation of this DTD. */
   string toString() {
-    (this.isPublic() and result = this.getRoot() + " PUBLIC '" +
-                                  this.getPublicId() + "' '" +
-                                  this.getSystemId() + "'") or
-    (not this.isPublic() and result = this.getRoot() +
-                                      " SYSTEM '" +
-                                      this.getSystemId() + "'")
+    (
+      this.isPublic() and
+      result = this.getRoot() + " PUBLIC '" + this.getPublicId() + "' '" + this.getSystemId() + "'"
+    )
+    or
+    (
+      not this.isPublic() and
+      result = this.getRoot() + " SYSTEM '" + this.getSystemId() + "'"
+    )
   }
 }
 
@@ -158,71 +162,61 @@ class XMLElement extends @xmlelement, XMLParent, XMLLocatable {
   predicate hasName(string name) { name = getName() }
 
   /** Gets the name of this XML element. */
-  override
-  string getName() { xmlElements(this,result,_,_,_) }
+  override string getName() { xmlElements(this, result, _, _, _) }
 
   /** Gets the XML file in which this XML element occurs. */
-  override
-  XMLFile getFile() { xmlElements(this,_,_,_,result) }
+  override XMLFile getFile() { xmlElements(this, _, _, _, result) }
 
   /** Gets the parent of this XML element. */
-  XMLParent getParent() { xmlElements(this,_,result,_,_) }
+  XMLParent getParent() { xmlElements(this, _, result, _, _) }
 
   /** Gets the index of this XML element among its parent's children. */
   int getIndex() { xmlElements(this, _, _, result, _) }
 
   /** Holds if this XML element has a namespace. */
-  predicate hasNamespace() { xmlHasNs(this,_,_) }
+  predicate hasNamespace() { xmlHasNs(this, _, _) }
 
   /** Gets the namespace of this XML element, if any. */
-  XMLNamespace getNamespace() { xmlHasNs(this,result,_) }
+  XMLNamespace getNamespace() { xmlHasNs(this, result, _) }
 
   /** Gets the index of this XML element among its parent's children. */
-  int getElementPositionIndex() { xmlElements(this,_,_,result,_) }
+  int getElementPositionIndex() { xmlElements(this, _, _, result, _) }
 
   /** Gets the depth of this element within the XML file tree structure. */
-  override
-  int getDepth() { result = this.getParent().getDepth() + 1 }
+  override int getDepth() { result = this.getParent().getDepth() + 1 }
 
   /** Gets an XML attribute of this XML element. */
   XMLAttribute getAnAttribute() { result.getElement() = this }
 
   /** Gets the attribute with the specified `name`, if any. */
-  XMLAttribute getAttribute(string name) {
-    result.getElement() = this and result.getName() = name
-  }
+  XMLAttribute getAttribute(string name) { result.getElement() = this and result.getName() = name }
 
   /** Holds if this XML element has an attribute with the specified `name`. */
-  predicate hasAttribute(string name) {
-    exists(XMLAttribute a| a = this.getAttribute(name))
-  }
+  predicate hasAttribute(string name) { exists(XMLAttribute a | a = this.getAttribute(name)) }
 
   /** Gets the value of the attribute with the specified `name`, if any. */
-  string getAttributeValue(string name) {
-    result = this.getAttribute(name).getValue()
-  }
+  string getAttributeValue(string name) { result = this.getAttribute(name).getValue() }
 
   /** Gets a printable representation of this XML element. */
-  override
-  string toString() { result = XMLParent.super.toString() }
+  override string toString() { result = XMLParent.super.toString() }
 }
 
 /** An attribute that occurs inside an XML element. */
 class XMLAttribute extends @xmlattribute, XMLLocatable {
   /** Gets the name of this attribute. */
-  string getName() { xmlAttrs(this,_,result,_,_,_) }
+  string getName() { xmlAttrs(this, _, result, _, _, _) }
 
   /** Gets the XML element to which this attribute belongs. */
-  XMLElement getElement() { xmlAttrs(this,result,_,_,_,_) }
+  XMLElement getElement() { xmlAttrs(this, result, _, _, _, _) }
 
   /** Holds if this attribute has a namespace. */
-  predicate hasNamespace() { xmlHasNs(this,_,_) }
+  predicate hasNamespace() { xmlHasNs(this, _, _) }
 
   /** Gets the namespace of this attribute, if any. */
-  XMLNamespace getNamespace() { xmlHasNs(this,result,_) }
+  XMLNamespace getNamespace() { xmlHasNs(this, result, _) }
 
   /** Gets the value of this attribute. */
-  string getValue() { xmlAttrs(this,_,_,result,_,_) }
+  string getValue() { xmlAttrs(this, _, _, result, _, _) }
 
   /** Gets a printable representation of this XML attribute. */
   override string toString() { result = this.getName() + "=" + this.getValue() }
@@ -231,17 +225,18 @@ class XMLAttribute extends @xmlattribute, XMLLocatable {
 /** A namespace used in an XML file */
 class XMLNamespace extends @xmlnamespace {
   /** Gets the prefix of this namespace. */
-  string getPrefix() { xmlNs(this,result,_,_) }
+  string getPrefix() { xmlNs(this, result, _, _) }
 
   /** Gets the URI of this namespace. */
-  string getURI() { xmlNs(this,_,result,_) }
+  string getURI() { xmlNs(this, _, result, _) }
 
   /** Holds if this namespace has no prefix. */
   predicate isDefault() { this.getPrefix() = "" }
 
   /** Gets a printable representation of this XML namespace. */
   string toString() {
-    (this.isDefault() and result = this.getURI()) or
+    (this.isDefault() and result = this.getURI())
+    or
     (not this.isDefault() and result = this.getPrefix() + ":" + this.getURI())
   }
 }
@@ -249,10 +244,10 @@ class XMLNamespace extends @xmlnamespace {
 /** A comment of the form `<!-- ... -->` is an XML comment. */
 class XMLComment extends @xmlcomment, XMLLocatable {
   /** Gets the text content of this XML comment. */
-  string getText() { xmlComments(this,result,_,_) }
+  string getText() { xmlComments(this, result, _, _) }
 
   /** Gets the parent of this XML comment. */
-  XMLParent getParent() { xmlComments(this,_,result,_) }
+  XMLParent getParent() { xmlComments(this, _, result, _) }
 
   /** Gets a printable representation of this XML comment. */
   override string toString() { result = this.getText() }
@@ -264,13 +259,13 @@ class XMLComment extends @xmlcomment, XMLLocatable {
  */
 class XMLCharacters extends @xmlcharacters, XMLLocatable {
   /** Gets the content of this character sequence. */
-  string getCharacters() { xmlChars(this,result,_,_,_,_) }
+  string getCharacters() { xmlChars(this, result, _, _, _, _) }
 
   /** Gets the parent of this character sequence. */
-  XMLParent getParent() { xmlChars(this,_,result,_,_,_) }
+  XMLParent getParent() { xmlChars(this, _, result, _, _, _) }
 
   /** Holds if this character sequence is CDATA. */
-  predicate isCDATA() { xmlChars(this,_,_,_,1,_) }
+  predicate isCDATA() { xmlChars(this, _, _, _, 1, _) }
 
   /** Gets a printable representation of this XML character sequence. */
   override string toString() { result = this.getCharacters() }
diff --git a/javascript/ql/src/semmle/javascript/YAML.qll b/javascript/ql/src/semmle/javascript/YAML.qll
index a0970517d020..1ec169cd3074 100644
--- a/javascript/ql/src/semmle/javascript/YAML.qll
+++ b/javascript/ql/src/semmle/javascript/YAML.qll
@@ -13,16 +13,12 @@ import javascript
  * referring to some other YAML value.
  */
 class YAMLNode extends @yaml_node, Locatable {
-  override Location getLocation() {
-    hasLocation(this, result)
-  }
+  override Location getLocation() { hasLocation(this, result) }
 
   /**
    * Gets the parent node of this node, which is always a collection.
    */
-  YAMLCollection getParentNode() {
-    yaml(this, _, result, _, _, _)
-  }
+  YAMLCollection getParentNode() { yaml(this, _, result, _, _, _) }
 
   /**
    * Gets the `i`th child node of this node.
@@ -30,84 +26,61 @@ class YAMLNode extends @yaml_node, Locatable {
    * _Note_: The index of a child node relative to its parent is considered
    * an implementation detail and may change between versions of the extractor.
    */
-  YAMLNode getChildNode(int i) {
-    yaml(result, _, this, i, _, _)
-  }
+  YAMLNode getChildNode(int i) { yaml(result, _, this, i, _, _) }
 
   /**
    * Gets a child node of this node.
    */
-  YAMLNode getAChildNode() {
-    result = getChildNode(_)
-  }
+  YAMLNode getAChildNode() { result = getChildNode(_) }
 
   /**
    * Gets the number of child nodes of this node.
    */
-  int getNumChild() {
-    result = count(getAChildNode())
-  }
+  int getNumChild() { result = count(getAChildNode()) }
 
   /**
    * Gets the `i`th child of this node, as a YAML value.
    */
-  YAMLValue getChild(int i) {
-    result = getChildNode(i).eval()
-  }
+  YAMLValue getChild(int i) { result = getChildNode(i).eval() }
 
   /**
    * Gets a child of this node, as a YAML value.
    */
-  YAMLValue getAChild() {
-    result = getChild(_)
-  }
+  YAMLValue getAChild() { result = getChild(_) }
 
   /**
    * Gets the tag of this node.
    */
-  string getTag() {
-    yaml(this, _, _, _, result, _)
-  }
+  string getTag() { yaml(this, _, _, _, result, _) }
 
   /**
    * Holds if this node is tagged with a standard type tag of the form
    * `tag:yaml.org,2002:<t>`.
    */
-  predicate hasStandardTypeTag(string t) {
-    t = getTag().regexpCapture("tag:yaml.org,2002:(.*)", 1)
-  }
+  predicate hasStandardTypeTag(string t) { t = getTag().regexpCapture("tag:yaml.org,2002:(.*)", 1) }
 
-  override string toString() {
-    yaml(this, _, _, _, _, result)
-  }
+  override string toString() { yaml(this, _, _, _, _, result) }
 
   /**
    * Gets the anchor associated with this node, if any.
    */
-  string getAnchor() {
-    yaml_anchors(this, result)
-  }
+  string getAnchor() { yaml_anchors(this, result) }
 
   /**
    * Gets the toplevel document to which this node belongs.
    */
-  YAMLDocument getDocument() {
-    result = getParentNode*()
-  }
+  YAMLDocument getDocument() { result = getParentNode*() }
 
   /**
    * Gets the YAML value this node corresponds to after resolving aliases and includes.
    */
-  YAMLValue eval() {
-    result = this
-  }
+  YAMLValue eval() { result = this }
 }
 
 /**
  * A YAML value; that is, either a scalar or a collection.
  */
-abstract class YAMLValue extends YAMLNode {
-}
+abstract class YAMLValue extends YAMLNode { }
 
 /**
  * A YAML scalar.
@@ -123,11 +96,15 @@ class YAMLScalar extends YAMLValue, @yaml_scalar_node {
    * - `"|"` (pipe): literal style
    */
   string getStyle() {
-    exists (int s | yaml_scalars(this, s, _) |
-      s =   0 and result = "" or
-      s =  34 and result = "\"" or
-      s =  39 and result = "'" or
-      s =  62 and result = ">" or
+    exists(int s | yaml_scalars(this, s, _) |
+      s = 0 and result = ""
+      or
+      s = 34 and result = "\""
+      or
+      s = 39 and result = "'"
+      or
+      s = 62 and result = ">"
+      or
       s = 124 and result = "|"
     )
   }
@@ -135,115 +112,80 @@ class YAMLScalar extends YAMLValue, @yaml_scalar_node {
   /**
    * Gets the value of this scalar, as a string.
    */
-  string getValue() {
-    yaml_scalars(this, _, result)
-  }
+  string getValue() { yaml_scalars(this, _, result) }
 }
 
 /**
  * A YAML scalar representing an integer value.
  */
 class YAMLInteger extends YAMLScalar {
-  YAMLInteger() {
-    hasStandardTypeTag("int")
-  }
+  YAMLInteger() { hasStandardTypeTag("int") }
 
   /**
    * Gets the value of this scalar, as an integer.
    */
-  int getIntValue() {
-    result = getValue().toInt()
-  }
+  int getIntValue() { result = getValue().toInt() }
 }
 
 /**
  * A YAML scalar representing a floating point value.
  */
 class YAMLFloat extends YAMLScalar {
-  YAMLFloat() {
-    hasStandardTypeTag("float")
-  }
+  YAMLFloat() { hasStandardTypeTag("float") }
 
   /**
    * Gets the value of this scalar, as a floating point number.
    */
-  float getFloatValue() {
-    result = getValue().toFloat()
-  }
+  float getFloatValue() { result = getValue().toFloat() }
 }
 
 /**
  * A YAML scalar representing a time stamp.
  */
 class YAMLTimestamp extends YAMLScalar {
-  YAMLTimestamp() {
-    hasStandardTypeTag("timestamp")
-  }
+  YAMLTimestamp() { hasStandardTypeTag("timestamp") }
 
   /**
    * Gets the value of this scalar, as a date.
    */
-  date getDateValue() {
-    result = getValue().toDate()
-  }
+  date getDateValue() { result = getValue().toDate() }
 }
 
 /**
  * A YAML scalar representing a Boolean value.
  */
 class YAMLBool extends YAMLScalar {
-  YAMLBool() {
-    hasStandardTypeTag("bool")
-  }
+  YAMLBool() { hasStandardTypeTag("bool") }
 
   /**
    * Gets the value of this scalar, as a Boolean.
    */
-  boolean getBoolValue() {
-    if getValue() = "true" then
-      result = true
-    else
-      result = false
-  }
+  boolean getBoolValue() { if getValue() = "true" then result = true else result = false }
 }
 
 /**
  * A YAML scalar representing the null value.
  */
-class YAMLNull extends YAMLScalar {
-  YAMLNull() {
-    hasStandardTypeTag("null")
-  }
-}
+class YAMLNull extends YAMLScalar { YAMLNull() { hasStandardTypeTag("null") } }
 
 /**
  * A YAML scalar representing a string value.
  */
-class YAMLString extends YAMLScalar {
-  YAMLString() {
-    hasStandardTypeTag("str")
-  }
-}
+class YAMLString extends YAMLScalar { YAMLString() { hasStandardTypeTag("str") } }
 
 /**
  * A YAML scalar representing a merge key.
  */
-class YAMLMergeKey extends YAMLScalar {
-  YAMLMergeKey() {
-    hasStandardTypeTag("merge")
-  }
-}
+class YAMLMergeKey extends YAMLScalar { YAMLMergeKey() { hasStandardTypeTag("merge") } }
 
 /**
  * A YAML scalar representing an `!include` directive.
  */
 class YAMLInclude extends YAMLScalar {
-  YAMLInclude() {
-    getTag() = "!include"
-  }
+  YAMLInclude() { getTag() = "!include" }
 
   override YAMLValue eval() {
-    exists (YAMLDocument targetDoc |
+    exists(YAMLDocument targetDoc |
       targetDoc.getFile().getAbsolutePath() = getTargetPath() and
       result = targetDoc.eval()
     )
@@ -253,11 +195,10 @@ class YAMLInclude extends YAMLScalar {
    * Gets the absolute path of the file included by this directive.
    */
   private string getTargetPath() {
-    exists (string path | path = getValue() |
-      if path.matches("/%") then
-        result = path
-      else
-        result = getDocument().getFile().getParentContainer().getAbsolutePath() + "/" + path
+    exists(string path | path = getValue() |
+      if path.matches("/%")
+      then result = path
+      else result = getDocument().getFile().getParentContainer().getAbsolutePath() + "/" + path
     )
   }
 }
@@ -265,8 +206,7 @@ class YAMLInclude extends YAMLScalar {
 /**
  * A YAML collection, that is, either a mapping or a sequence.
  */
-class YAMLCollection extends YAMLValue, @yaml_collection_node {
-}
+class YAMLCollection extends YAMLValue, @yaml_collection_node { }
 
 /**
  * A YAML mapping.
@@ -277,7 +217,7 @@ class YAMLMapping extends YAMLCollection, @yaml_mapping_node {
    */
   YAMLNode getKeyNode(int i) {
     i >= 0 and
-    exists (int j | i=j-1 and result = getChildNode(j))
+    exists(int j | i = j - 1 and result = getChildNode(j))
   }
 
   /**
@@ -285,41 +225,32 @@ class YAMLMapping extends YAMLCollection, @yaml_mapping_node {
    */
   YAMLNode getValueNode(int i) {
     i >= 0 and
-    exists (int j | i=-j-1 and result = getChildNode(j))
+    exists(int j | i = -j - 1 and result = getChildNode(j))
   }
 
   /**
    * Gets the `i`th key of this mapping, as a YAML value.
    */
-  YAMLValue getKey(int i) {
-    result = getKeyNode(i).eval()
-  }
+  YAMLValue getKey(int i) { result = getKeyNode(i).eval() }
 
   /**
    * Gets the `i`th value of this mapping, as a YAML value.
    */
-  YAMLValue getValue(int i) {
-    result = getValueNode(i).eval()
-  }
+  YAMLValue getValue(int i) { result = getValueNode(i).eval() }
 
   /**
    * Holds if this mapping maps `key` to `value`.
    */
   predicate maps(YAMLValue key, YAMLValue value) {
-    exists (int i | key = getKey(i) and value = getValue(i)) or
-    exists (YAMLMergeKey merge, YAMLMapping that | maps(merge, that) |
-      that.maps(key, value)
-    )
+    exists(int i | key = getKey(i) and value = getValue(i))
+    or
+    exists(YAMLMergeKey merge, YAMLMapping that | maps(merge, that) | that.maps(key, value))
   }
 
   /**
    * Gets the value that this mapping maps `key` to.
    */
-  YAMLValue lookup(string key) {
-    exists (YAMLScalar s | s.getValue() = key |
-      maps(s, result)
-    )
-  }
+  YAMLValue lookup(string key) { exists(YAMLScalar s | s.getValue() = key | maps(s, result)) }
 }
 
 /**
@@ -329,16 +260,12 @@ class YAMLSequence extends YAMLCollection, @yaml_sequence_node {
   /**
    * Gets the `i`th element in this sequence.
    */
-  YAMLNode getElementNode(int i) {
-    result = getChildNode(i)
-  }
+  YAMLNode getElementNode(int i) { result = getChildNode(i) }
 
   /**
    * Gets the `i`th element in this sequence, as a YAML value.
    */
-  YAMLValue getElement(int i) {
-    result = getElementNode(i).eval()
-  }
+  YAMLValue getElement(int i) { result = getElementNode(i).eval() }
 }
 
 /**
@@ -353,29 +280,19 @@ class YAMLAliasNode extends YAMLNode, @yaml_alias_node {
   /**
    * Gets the target anchor this alias refers to.
    */
-  string getTarget() {
-    yaml_aliases(this, result)
-  }
+  string getTarget() { yaml_aliases(this, result) }
 }
 
 /**
  * A YAML document.
  */
-class YAMLDocument extends YAMLNode {
-  YAMLDocument() {
-    not exists(getParentNode())
-  }
-}
+class YAMLDocument extends YAMLNode { YAMLDocument() { not exists(getParentNode()) } }
 
 /**
  * An error message produced by the YAML parser while processing a YAML file.
  */
 class YAMLParseError extends @yaml_error, Error {
-  override string getMessage() {
-    yaml_errors(this, result)
-  }
+  override string getMessage() { yaml_errors(this, result) }
 
-  override string toString() {
-    result = getMessage()
-  }
-}
\ No newline at end of file
+  override string toString() { result = getMessage() }
+}
diff --git a/javascript/ql/src/semmle/javascript/dataflow/AbstractProperties.qll b/javascript/ql/src/semmle/javascript/dataflow/AbstractProperties.qll
index 9d5ee2065328..ecd73db588eb 100644
--- a/javascript/ql/src/semmle/javascript/dataflow/AbstractProperties.qll
+++ b/javascript/ql/src/semmle/javascript/dataflow/AbstractProperties.qll
@@ -11,16 +11,11 @@ private import semmle.javascript.dataflow.internal.AbstractPropertiesImpl
 class AbstractProperty extends TAbstractProperty {
   // Implementation note: Binding `base` and `propertyName` to fields
   // would be slightly more elegant, but leads to worse performance on very big snapshots.
-
   /** Gets the base object of this abstract property. */
-  AbstractValue getBase() {
-    this = MkAbstractProperty(result, _)
-  }
+  AbstractValue getBase() { this = MkAbstractProperty(result, _) }
 
   /** Gets the property name of this abstract property. */
-  string getPropertyName() {
-    this = MkAbstractProperty(_, result)
-  }
+  string getPropertyName() { this = MkAbstractProperty(_, result) }
 
   /**
    * Gets an initial value that is implicitly assigned to this property.
@@ -50,9 +45,7 @@ class AbstractProperty extends TAbstractProperty {
   /**
    * Gets a textual representation of this element.
    */
-  string toString() {
-    result = "property " + getPropertyName() + " of " + getBase()
-  }
+  string toString() { result = "property " + getPropertyName() + " of " + getBase() }
 }
 
 /**
@@ -60,26 +53,24 @@ class AbstractProperty extends TAbstractProperty {
  * class instance.
  */
 class AbstractProtoProperty extends AbstractProperty {
-  AbstractProtoProperty() {
-    getPropertyName() = "__proto__"
-  }
+  AbstractProtoProperty() { getPropertyName() = "__proto__" }
 
   override AbstractValue getAValue() {
     result = super.getAValue() and
     (
-     not result instanceof PrimitiveAbstractValue or
-     result instanceof AbstractNull
+      not result instanceof PrimitiveAbstractValue or
+      result instanceof AbstractNull
     )
     or
-    exists (AbstractCallable ctor | getBase() = TAbstractInstance(ctor) |
+    exists(AbstractCallable ctor | getBase() = TAbstractInstance(ctor) |
       // the value of `ctor.prototype`
-      exists (AbstractProperty prototype |
-        prototype = MkAbstractProperty((AbstractFunction)ctor, "prototype") and
+      exists(AbstractProperty prototype |
+        prototype = MkAbstractProperty(ctor.(AbstractFunction), "prototype") and
         result = prototype.getALocalValue()
       )
       or
       // instance of super class
-      exists (ClassDefinition cd, AbstractCallable superCtor |
+      exists(ClassDefinition cd, AbstractCallable superCtor |
         cd = ctor.(AbstractClass).getClass() and
         superCtor = cd.getSuperClass().analyze().getALocalValue() and
         result = TAbstractInstance(superCtor)
@@ -96,7 +87,5 @@ class AbstractProtoProperty extends AbstractProperty {
  * which in turn introduces a materialization.
  */
 private AbstractValue getAnAssignedValue(AbstractValue b, string p) {
-  exists (AnalyzedPropertyWrite apw |
-    apw.writesValue(b, p, result)
-  )
+  exists(AnalyzedPropertyWrite apw | apw.writesValue(b, p, result))
 }
diff --git a/javascript/ql/src/semmle/javascript/dataflow/AbstractValues.qll b/javascript/ql/src/semmle/javascript/dataflow/AbstractValues.qll
index 188f37528947..e2c0d3137172 100644
--- a/javascript/ql/src/semmle/javascript/dataflow/AbstractValues.qll
+++ b/javascript/ql/src/semmle/javascript/dataflow/AbstractValues.qll
@@ -78,9 +78,7 @@ class AbstractValue extends TAbstractValue {
    * Holds if this abstract value is an indefinite value arising from the
    * incompleteness `cause`.
    */
-  predicate isIndefinite(DataFlow::Incompleteness cause) {
-    none()
-  }
+  predicate isIndefinite(DataFlow::Incompleteness cause) { none() }
 
   /**
    * Gets an abstract value that represents a prototype object of this value.
@@ -100,7 +98,7 @@ class AbstractValue extends TAbstractValue {
    * this predicate cannot be relied on to compute all possible prototype objects.
    */
   DefiniteAbstractValue getAPrototype() {
-    exists (AbstractProtoProperty proto |
+    exists(AbstractProtoProperty proto |
       proto.getBase() = this and
       result = proto.getAValue()
     )
@@ -113,8 +111,7 @@ class AbstractValue extends TAbstractValue {
    * For more information, see
    * [LGTM locations](https://lgtm.com/help/ql/locations).
    */
-  predicate hasLocationInfo(string f, int startline, int startcolumn,
-                                      int endline, int endcolumn) {
+  predicate hasLocationInfo(string f, int startline, int startcolumn, int endline, int endcolumn) {
     f = "" and startline = 0 and startcolumn = 0 and endline = 0 and endcolumn = 0
   }
 
@@ -126,18 +123,15 @@ class AbstractValue extends TAbstractValue {
  * A definite abstract value, that is, an abstract value that is not
  * affected by analysis incompleteness.
  */
-abstract class DefiniteAbstractValue extends AbstractValue {
-}
+abstract class DefiniteAbstractValue extends AbstractValue { }
 
 /**
  * A definite abstract value that represents only primitive concrete values.
  */
 abstract class PrimitiveAbstractValue extends DefiniteAbstractValue {
-  override PrimitiveAbstractValue toPrimitive() {
-    result = this
-  }
+  override PrimitiveAbstractValue toPrimitive() { result = this }
 
-  override abstract PrimitiveType getType();
+  abstract override PrimitiveType getType();
 }
 
 /**
@@ -145,8 +139,11 @@ abstract class PrimitiveAbstractValue extends DefiniteAbstractValue {
  */
 class AbstractNull extends PrimitiveAbstractValue, TAbstractNull {
   override boolean getBooleanValue() { result = false }
+
   override PrimitiveType getType() { result = TTNull() }
+
   override predicate isCoercibleToNumber() { none() }
+
   override string toString() { result = "null" }
 }
 
@@ -155,8 +152,11 @@ class AbstractNull extends PrimitiveAbstractValue, TAbstractNull {
  */
 class AbstractUndefined extends PrimitiveAbstractValue, TAbstractUndefined {
   override boolean getBooleanValue() { result = false }
+
   override PrimitiveType getType() { result = TTUndefined() }
+
   override predicate isCoercibleToNumber() { none() }
+
   override string toString() { result = "undefined" }
 }
 
@@ -165,8 +165,11 @@ class AbstractUndefined extends PrimitiveAbstractValue, TAbstractUndefined {
  */
 class AbstractBoolean extends PrimitiveAbstractValue, TAbstractBoolean {
   override boolean getBooleanValue() { this = TAbstractBoolean(result) }
+
   override PrimitiveType getType() { result = TTBoolean() }
+
   override predicate isCoercibleToNumber() { any() }
+
   override string toString() { result = getBooleanValue().toString() }
 }
 
@@ -175,8 +178,11 @@ class AbstractBoolean extends PrimitiveAbstractValue, TAbstractBoolean {
  */
 class AbstractZero extends PrimitiveAbstractValue, TAbstractZero {
   override boolean getBooleanValue() { result = false }
+
   override PrimitiveType getType() { result = TTNumber() }
+
   override predicate isCoercibleToNumber() { any() }
+
   override string toString() { result = "0" }
 }
 
@@ -185,8 +191,11 @@ class AbstractZero extends PrimitiveAbstractValue, TAbstractZero {
  */
 class AbstractNonZero extends PrimitiveAbstractValue, TAbstractNonZero {
   override boolean getBooleanValue() { result = true }
+
   override PrimitiveType getType() { result = TTNumber() }
+
   override predicate isCoercibleToNumber() { any() }
+
   override string toString() { result = "non-zero value" }
 }
 
@@ -195,8 +204,11 @@ class AbstractNonZero extends PrimitiveAbstractValue, TAbstractNonZero {
  */
 class AbstractEmpty extends PrimitiveAbstractValue, TAbstractEmpty {
   override boolean getBooleanValue() { result = false }
+
   override PrimitiveType getType() { result = TTString() }
+
   override predicate isCoercibleToNumber() { any() }
+
   override string toString() { result = "\"\"" }
 }
 
@@ -206,8 +218,11 @@ class AbstractEmpty extends PrimitiveAbstractValue, TAbstractEmpty {
  */
 class AbstractNumString extends PrimitiveAbstractValue, TAbstractNumString {
   override boolean getBooleanValue() { result = true }
+
   override PrimitiveType getType() { result = TTString() }
+
   override predicate isCoercibleToNumber() { any() }
+
   override string toString() { result = "numeric string" }
 }
 
@@ -216,8 +231,11 @@ class AbstractNumString extends PrimitiveAbstractValue, TAbstractNumString {
  */
 class AbstractOtherString extends PrimitiveAbstractValue, TAbstractOtherString {
   override boolean getBooleanValue() { result = true }
+
   override PrimitiveType getType() { result = TTString() }
+
   override predicate isCoercibleToNumber() { none() }
+
   override string toString() { result = "non-empty, non-numeric string" }
 }
 
@@ -226,9 +244,13 @@ class AbstractOtherString extends PrimitiveAbstractValue, TAbstractOtherString {
  */
 class AbstractRegExp extends DefiniteAbstractValue, TAbstractRegExp {
   override boolean getBooleanValue() { result = true }
+
   override InferredType getType() { result = TTRegExp() }
+
   override predicate isCoercibleToNumber() { none() }
+
   override PrimitiveAbstractValue toPrimitive() { result = TAbstractOtherString() }
+
   override string toString() { result = "regular expression" }
 }
 
@@ -247,13 +269,21 @@ abstract class AbstractCallable extends DefiniteAbstractValue {
  */
 class AbstractFunction extends AbstractCallable, TAbstractFunction {
   override Function getFunction() { this = TAbstractFunction(result) }
+
   override boolean getBooleanValue() { result = true }
+
   override InferredType getType() { result = TTFunction() }
+
   override predicate isCoercibleToNumber() { none() }
+
   override PrimitiveAbstractValue toPrimitive() { result = TAbstractOtherString() }
-  override predicate hasLocationInfo(string path, int startline, int startcolumn, int endline, int endcolumn) {
+
+  override predicate hasLocationInfo(
+    string path, int startline, int startcolumn, int endline, int endcolumn
+  ) {
     getFunction().getLocation().hasLocationInfo(path, startline, startcolumn, endline, endcolumn)
   }
+
   override string toString() { result = getFunction().describe() }
 }
 
@@ -264,30 +294,39 @@ class AbstractClass extends AbstractCallable, TAbstractClass {
   /**
    * Gets the class represented by this abstract value.
    */
-  ClassDefinition getClass() {
-    this = TAbstractClass(result)
-  }
+  ClassDefinition getClass() { this = TAbstractClass(result) }
 
   override Function getFunction() { result = getClass().getConstructor().getBody() }
+
   override boolean getBooleanValue() { result = true }
+
   override InferredType getType() { result = TTClass() }
+
   override predicate isCoercibleToNumber() { none() }
+
   override PrimitiveAbstractValue toPrimitive() { result = TAbstractOtherString() }
-  override predicate hasLocationInfo(string path, int startline, int startcolumn, int endline, int endcolumn) {
+
+  override predicate hasLocationInfo(
+    string path, int startline, int startcolumn, int endline, int endcolumn
+  ) {
     getClass().getLocation().hasLocationInfo(path, startline, startcolumn, endline, endcolumn)
   }
+
   override string toString() { result = getClass().describe() }
 }
 
-
 /**
  * An abstract value representing a `Date` object.
  */
 class AbstractDate extends DefiniteAbstractValue, TAbstractDate {
   override boolean getBooleanValue() { result = true }
+
   override InferredType getType() { result = TTDate() }
+
   override predicate isCoercibleToNumber() { any() }
+
   override PrimitiveAbstractValue toPrimitive() { result.getType() = TTNumber() }
+
   override string toString() { result = "date" }
 }
 
@@ -296,17 +335,22 @@ class AbstractDate extends DefiniteAbstractValue, TAbstractDate {
  */
 class AbstractArguments extends DefiniteAbstractValue, TAbstractArguments {
   /** Gets the function whose `arguments` object this is an abstraction of. */
-  Function getFunction() {
-    this = TAbstractArguments(result)
-  }
+  Function getFunction() { this = TAbstractArguments(result) }
 
   override boolean getBooleanValue() { result = true }
+
   override InferredType getType() { result = TTObject() }
+
   override predicate isCoercibleToNumber() { none() }
+
   override PrimitiveAbstractValue toPrimitive() { result = TAbstractOtherString() }
-  override predicate hasLocationInfo(string path, int startline, int startcolumn, int endline, int endcolumn) {
+
+  override predicate hasLocationInfo(
+    string path, int startline, int startcolumn, int endline, int endcolumn
+  ) {
     getFunction().getLocation().hasLocationInfo(path, startline, startcolumn, endline, endcolumn)
   }
+
   override string toString() { result = "arguments object of " + getFunction().describe() }
 }
 
@@ -315,9 +359,13 @@ class AbstractArguments extends DefiniteAbstractValue, TAbstractArguments {
  */
 class AbstractGlobalObject extends DefiniteAbstractValue, TAbstractGlobalObject {
   override boolean getBooleanValue() { result = true }
+
   override InferredType getType() { result = TTObject() }
+
   override predicate isCoercibleToNumber() { none() }
+
   override PrimitiveAbstractValue toPrimitive() { result = TAbstractOtherString() }
+
   override string toString() { result = "global" }
 }
 
@@ -327,13 +375,21 @@ class AbstractGlobalObject extends DefiniteAbstractValue, TAbstractGlobalObject
 class AbstractModuleObject extends DefiniteAbstractValue, TAbstractModuleObject {
   /** Gets the module whose `module` object this abstract value represents. */
   Module getModule() { this = TAbstractModuleObject(result) }
+
   override boolean getBooleanValue() { result = true }
+
   override InferredType getType() { result = TTObject() }
+
   override predicate isCoercibleToNumber() { none() }
+
   override PrimitiveAbstractValue toPrimitive() { result = TAbstractOtherString() }
-  override predicate hasLocationInfo(string path, int startline, int startcolumn, int endline, int endcolumn) {
+
+  override predicate hasLocationInfo(
+    string path, int startline, int startcolumn, int endline, int endcolumn
+  ) {
     getModule().getLocation().hasLocationInfo(path, startline, startcolumn, endline, endcolumn)
   }
+
   override string toString() { result = "module object of module " + getModule().getName() }
 }
 
@@ -343,13 +399,21 @@ class AbstractModuleObject extends DefiniteAbstractValue, TAbstractModuleObject
 class AbstractExportsObject extends DefiniteAbstractValue, TAbstractExportsObject {
   /** Gets the module whose `exports` object this abstract value represents. */
   Module getModule() { this = TAbstractExportsObject(result) }
+
   override boolean getBooleanValue() { result = true }
+
   override InferredType getType() { result = TTObject() }
+
   override predicate isCoercibleToNumber() { none() }
+
   override PrimitiveAbstractValue toPrimitive() { result = TAbstractOtherString() }
-  override predicate hasLocationInfo(string path, int startline, int startcolumn, int endline, int endcolumn) {
+
+  override predicate hasLocationInfo(
+    string path, int startline, int startcolumn, int endline, int endcolumn
+  ) {
     getModule().getLocation().hasLocationInfo(path, startline, startcolumn, endline, endcolumn)
   }
+
   override string toString() { result = "exports object of module " + getModule().getName() }
 }
 
@@ -360,13 +424,21 @@ class AbstractExportsObject extends DefiniteAbstractValue, TAbstractExportsObjec
 class AbstractObjectLiteral extends DefiniteAbstractValue, TAbstractObjectLiteral {
   /** Gets the object expression this abstract value represents. */
   ObjectExpr getObjectExpr() { this = TAbstractObjectLiteral(result) }
+
   override boolean getBooleanValue() { result = true }
+
   override InferredType getType() { result = TTObject() }
+
   override predicate isCoercibleToNumber() { none() }
+
   override PrimitiveAbstractValue toPrimitive() { result.getType() = TTString() }
-  override predicate hasLocationInfo(string path, int startline, int startcolumn, int endline, int endcolumn) {
+
+  override predicate hasLocationInfo(
+    string path, int startline, int startcolumn, int endline, int endcolumn
+  ) {
     getObjectExpr().getLocation().hasLocationInfo(path, startline, startcolumn, endline, endcolumn)
   }
+
   override string toString() { result = "object literal" }
 }
 
@@ -378,13 +450,21 @@ class AbstractObjectLiteral extends DefiniteAbstractValue, TAbstractObjectLitera
 class AbstractInstance extends DefiniteAbstractValue, TAbstractInstance {
   /** Gets the constructor of this instance. */
   AbstractCallable getConstructor() { this = TAbstractInstance(result) }
+
   override boolean getBooleanValue() { result = true }
+
   override InferredType getType() { result = TTObject() }
+
   override predicate isCoercibleToNumber() { none() }
+
   override PrimitiveAbstractValue toPrimitive() { result.getType() = TTString() }
-  override predicate hasLocationInfo(string path, int startline, int startcolumn, int endline, int endcolumn) {
+
+  override predicate hasLocationInfo(
+    string path, int startline, int startcolumn, int endline, int endcolumn
+  ) {
     getConstructor().hasLocationInfo(path, startline, startcolumn, endline, endcolumn)
   }
+
   override string toString() { result = "instance of " + getConstructor() }
 }
 
@@ -405,9 +485,13 @@ module AbstractInstance {
  */
 class AbstractOtherObject extends DefiniteAbstractValue, TAbstractOtherObject {
   override boolean getBooleanValue() { result = true }
+
   override InferredType getType() { result = TTObject() }
+
   override predicate isCoercibleToNumber() { none() }
+
   override PrimitiveAbstractValue toPrimitive() { result.getType() = TTString() }
+
   override string toString() { result = "object" }
 }
 
@@ -416,14 +500,19 @@ class AbstractOtherObject extends DefiniteAbstractValue, TAbstractOtherObject {
  */
 class IndefiniteFunctionOrClass extends AbstractValue, TIndefiniteFunctionOrClass {
   override boolean getBooleanValue() { result = true }
+
   override InferredType getType() { result = TTFunction() or result = TTClass() }
+
   override predicate isCoercibleToNumber() { none() }
+
   override PrimitiveAbstractValue toPrimitive() { result = TAbstractOtherString() }
+
   override predicate isIndefinite(DataFlow::Incompleteness cause) {
     this = TIndefiniteFunctionOrClass(cause)
   }
+
   override string toString() {
-    exists (DataFlow::Incompleteness cause | isIndefinite(cause) |
+    exists(DataFlow::Incompleteness cause | isIndefinite(cause) |
       result = "indefinite function or class (" + cause + ")"
     )
   }
@@ -434,18 +523,23 @@ class IndefiniteFunctionOrClass extends AbstractValue, TIndefiniteFunctionOrClas
  */
 class IndefiniteObject extends AbstractValue, TIndefiniteObject {
   override boolean getBooleanValue() { result = true }
+
   override InferredType getType() {
     result = TTDate() or result = TTRegExp() or result = TTObject()
   }
+
   override predicate isCoercibleToNumber() { any() }
+
   override PrimitiveAbstractValue toPrimitive() {
     result.getType() = TTString() or result.getType() = TTNumber()
   }
+
   override predicate isIndefinite(DataFlow::Incompleteness cause) {
     this = TIndefiniteObject(cause)
   }
+
   override string toString() {
-    exists (DataFlow::Incompleteness cause | isIndefinite(cause) |
+    exists(DataFlow::Incompleteness cause | isIndefinite(cause) |
       result = "indefinite object (" + cause + ")"
     )
   }
@@ -456,14 +550,19 @@ class IndefiniteObject extends AbstractValue, TIndefiniteObject {
  */
 class IndefiniteAbstractValue extends AbstractValue, TIndefiniteAbstractValue {
   override boolean getBooleanValue() { result = true or result = false }
+
   override InferredType getType() { any() }
+
   override predicate isCoercibleToNumber() { any() }
+
   override PrimitiveAbstractValue toPrimitive() { any() }
+
   override predicate isIndefinite(DataFlow::Incompleteness cause) {
     this = TIndefiniteAbstractValue(cause)
   }
+
   override string toString() {
-    exists (DataFlow::Incompleteness cause | isIndefinite(cause) |
+    exists(DataFlow::Incompleteness cause | isIndefinite(cause) |
       result = "indefinite value (" + cause + ")"
     )
   }
@@ -476,7 +575,7 @@ class IndefiniteAbstractValue extends AbstractValue, TIndefiniteAbstractValue {
    * set of concrete values represented by this abstract value.
    */
   AbstractValue split() {
-    exists (string cause | isIndefinite(cause) |
+    exists(string cause | isIndefinite(cause) |
       result = TIndefiniteFunctionOrClass(cause) or
       result = TIndefiniteObject(cause) or
       result = abstractValueOfType(any(PrimitiveType pt))
@@ -488,7 +587,8 @@ class IndefiniteAbstractValue extends AbstractValue, TIndefiniteAbstractValue {
  * A string tag corresponding to a custom abstract value.
  */
 abstract class CustomAbstractValueTag extends string {
-  bindingset[this] CustomAbstractValueTag() { any() }
+  bindingset[this]
+  CustomAbstractValueTag() { any() }
 
   /**
    * Gets the type of some concrete value represented by this
@@ -521,9 +621,7 @@ abstract class CustomAbstractValueTag extends string {
    * Holds if this abstract value is an indefinite value arising from the
    * incompleteness `cause`.
    */
-  predicate isIndefinite(DataFlow::Incompleteness cause) {
-    none()
-  }
+  predicate isIndefinite(DataFlow::Incompleteness cause) { none() }
 
   /** Gets a textual representation of this abstract value. */
   abstract string describe();
@@ -541,11 +639,14 @@ class CustomAbstractValue extends AbstractValue, TCustomAbstractValue {
   CustomAbstractValueTag getTag() { result = tag }
 
   override boolean getBooleanValue() { result = tag.getBooleanValue() }
+
   override InferredType getType() { result = tag.getType() }
+
   override predicate isCoercibleToNumber() { tag.isCoercibleToNumber() }
+
   override PrimitiveAbstractValue toPrimitive() { result = tag.toPrimitive() }
-  override predicate isIndefinite(DataFlow::Incompleteness cause) {
-    tag.isIndefinite(cause)
-  }
+
+  override predicate isIndefinite(DataFlow::Incompleteness cause) { tag.isIndefinite(cause) }
+
   override string toString() { result = tag.describe() }
 }
diff --git a/javascript/ql/src/semmle/javascript/dataflow/CallGraph.qll b/javascript/ql/src/semmle/javascript/dataflow/CallGraph.qll
index 43ac39cf8820..caf2ee8fbdf4 100644
--- a/javascript/ql/src/semmle/javascript/dataflow/CallGraph.qll
+++ b/javascript/ql/src/semmle/javascript/dataflow/CallGraph.qll
@@ -18,9 +18,8 @@ deprecated class CallSite extends @invokeexpr {
   CallSite() { invk = this }
 
   /** Gets an abstract value representing possible callees of this call site. */
-  cached AbstractValue getACalleeValue() {
-    result = invk.getCallee().analyze().getAValue()
-  }
+  cached
+  AbstractValue getACalleeValue() { result = invk.getCallee().analyze().getAValue() }
 
   /**
    * Gets the data flow node corresponding to the `i`th argument passed to the callee
@@ -46,8 +45,9 @@ deprecated class CallSite extends @invokeexpr {
 
   /** Holds if `invk` has a spread argument at index `i` or earlier. */
   private predicate earlierSpreadArgument(int i) {
-    invk.isSpreadArgument(i) or
-    (earlierSpreadArgument(i-1) and i < invk.getNumArgument())
+    invk.isSpreadArgument(i)
+    or
+    (earlierSpreadArgument(i - 1) and i < invk.getNumArgument())
   }
 
   /** Gets a potential callee based on dataflow analysis results. */
@@ -67,9 +67,7 @@ deprecated class CallSite extends @invokeexpr {
    * Holds if the approximation of possible callees for this call site is
    * affected by the given analysis incompleteness `cause`.
    */
-  predicate isIndefinite(DataFlow::Incompleteness cause) {
-    getACalleeValue().isIndefinite(cause)
-  }
+  predicate isIndefinite(DataFlow::Incompleteness cause) { getACalleeValue().isIndefinite(cause) }
 
   /**
    * Holds if our approximation of possible callees for this call site is
@@ -84,9 +82,7 @@ deprecated class CallSite extends @invokeexpr {
    */
   predicate isImprecise() {
     isIndefinite("global") and
-    exists (DefiniteAbstractValue v | v = getACalleeValue() |
-      not v instanceof AbstractCallable
-    )
+    exists(DefiniteAbstractValue v | v = getACalleeValue() | not v instanceof AbstractCallable)
   }
 
   /**
@@ -96,27 +92,21 @@ deprecated class CallSite extends @invokeexpr {
   predicate isIncomplete() {
     // the flow analysis identifies a source of incompleteness other than
     // global flow (which usually leads to imprecision rather than incompleteness)
-    any (DataFlow::Incompleteness cause | isIndefinite(cause)) != "global"
+    any(DataFlow::Incompleteness cause | isIndefinite(cause)) != "global"
   }
 
   /**
    * Holds if our approximation of possible callees for this call site is
    * likely to be imprecise or incomplete.
    */
-  predicate isUncertain() {
-    isImprecise() or isIncomplete()
-  }
+  predicate isUncertain() { isImprecise() or isIncomplete() }
 
   /**
    * Gets a textual representation of this invocation.
    */
-  string toString() {
-    result = this.(InvokeExpr).toString()
-  }
+  string toString() { result = this.(InvokeExpr).toString() }
 
-  Location getLocation() {
-    result = this.(InvokeExpr).getLocation()
-  }
+  Location getLocation() { result = this.(InvokeExpr).getLocation() }
 }
 
 /**
@@ -124,6 +114,7 @@ deprecated class CallSite extends @invokeexpr {
  */
 deprecated class ReflectiveCallSite extends CallSite {
   DataFlow::AnalyzedNode callee;
+
   string callMode;
 
   ReflectiveCallSite() {
@@ -131,12 +122,10 @@ deprecated class ReflectiveCallSite extends CallSite {
     (callMode = "call" or callMode = "apply")
   }
 
-  override AbstractValue getACalleeValue() {
-    result = callee.getAValue()
-  }
+  override AbstractValue getACalleeValue() { result = callee.getAValue() }
 
   override DataFlow::AnalyzedNode getArgumentNode(int i) {
     callMode = "call" and
-    result = super.getArgumentNode(i+1)
+    result = super.getArgumentNode(i + 1)
   }
 }
diff --git a/javascript/ql/src/semmle/javascript/dataflow/Configuration.qll b/javascript/ql/src/semmle/javascript/dataflow/Configuration.qll
index ec8b195063dd..087e659dd7bc 100644
--- a/javascript/ql/src/semmle/javascript/dataflow/Configuration.qll
+++ b/javascript/ql/src/semmle/javascript/dataflow/Configuration.qll
@@ -89,32 +89,24 @@ abstract class Configuration extends string {
   /**
    * Holds if `source` is a relevant data flow source for this configuration.
    */
-  predicate isSource(DataFlow::Node source) {
-    none()
-  }
+  predicate isSource(DataFlow::Node source) { none() }
 
   /**
    * Holds if `source` is a source of flow labeled with `lbl` that is relevant
    * for this configuration.
    */
-  predicate isSource(DataFlow::Node source, FlowLabel lbl) {
-    none()
-  }
+  predicate isSource(DataFlow::Node source, FlowLabel lbl) { none() }
 
   /**
    * Holds if `sink` is a relevant data flow sink for this configuration.
    */
-  predicate isSink(DataFlow::Node sink) {
-    none()
-  }
+  predicate isSink(DataFlow::Node sink) { none() }
 
   /**
    * Holds if `sink` is a sink of flow labeled with `lbl` that is relevant
    * for this configuration.
    */
-  predicate isSink(DataFlow::Node sink, FlowLabel lbl) {
-    none()
-  }
+  predicate isSink(DataFlow::Node sink, FlowLabel lbl) { none() }
 
   /**
    * Holds if `src -> trg` should be considered as a flow edge
@@ -138,7 +130,9 @@ abstract class Configuration extends string {
    * Holds if `src -> trg` is a flow edge converting flow with label `inlbl` to
    * flow with label `outlbl`.
    */
-  predicate isAdditionalFlowStep(DataFlow::Node src, DataFlow::Node trg, FlowLabel inlbl, FlowLabel outlbl) {
+  predicate isAdditionalFlowStep(
+    DataFlow::Node src, DataFlow::Node trg, FlowLabel inlbl, FlowLabel outlbl
+  ) {
     none()
   }
 
@@ -146,7 +140,7 @@ abstract class Configuration extends string {
    * Holds if the intermediate flow node `node` is prohibited.
    */
   predicate isBarrier(DataFlow::Node node) {
-    exists (BarrierGuardNode guard |
+    exists(BarrierGuardNode guard |
       not guard instanceof LabeledBarrierGuardNode and
       isBarrierGuard(guard) and
       guard.blocks(node)
@@ -167,7 +161,7 @@ abstract class Configuration extends string {
    * Holds if flow with label `lbl` cannot flow into `node`.
    */
   predicate isLabeledBarrier(DataFlow::Node node, FlowLabel lbl) {
-    exists (LabeledBarrierGuardNode guard |
+    exists(LabeledBarrierGuardNode guard |
       lbl = guard.getALabel() and
       isBarrierGuard(guard) and
       guard.blocks(node)
@@ -188,8 +182,9 @@ abstract class Configuration extends string {
    * Holds if data may flow from `source` to `sink` for this configuration.
    */
   predicate hasFlow(DataFlow::Node source, DataFlow::Node sink) {
-    isSource(_, this, _) and isSink(_, this, _) and
-    exists (SourcePathNode flowsource, SinkPathNode flowsink |
+    isSource(_, this, _) and
+    isSink(_, this, _) and
+    exists(SourcePathNode flowsource, SinkPathNode flowsink |
       hasFlowPath(flowsource, flowsink) and
       source = flowsource.getNode() and
       sink = flowsink.getNode()
@@ -217,9 +212,7 @@ abstract class Configuration extends string {
    *
    * Holds if `source` flows to `sink`.
    */
-  deprecated predicate flowsTo(DataFlow::Node source, DataFlow::Node sink) {
-    hasFlow(source, sink)
-  }
+  deprecated predicate flowsTo(DataFlow::Node source, DataFlow::Node sink) { hasFlow(source, sink) }
 
   /**
    * DEPRECATED: Use `hasFlow` instead.
@@ -239,7 +232,8 @@ abstract class Configuration extends string {
  * from a flow source via one or more transformations (such as string operations).
  */
 abstract class FlowLabel extends string {
-  bindingset[this] FlowLabel() { any() }
+  bindingset[this]
+  FlowLabel() { any() }
 }
 
 /**
@@ -276,7 +270,6 @@ module FlowLabel {
  * extent of `cfg.isBarrierGuard`.
  */
 abstract class BarrierGuardNode extends DataFlow::Node {
-
   /**
    * Holds if data flow node `nd` acts as a barrier for data flow.
    *
@@ -284,16 +277,16 @@ abstract class BarrierGuardNode extends DataFlow::Node {
    */
   predicate blocks(DataFlow::Node nd) {
     // 1) `nd` is a use of a refinement node that blocks its input variable
-    exists (SsaRefinementNode ref |
+    exists(SsaRefinementNode ref |
       nd = DataFlow::ssaDefinitionNode(ref) and
-      forex (SsaVariable input | input = ref.getAnInput() |
+      forex(SsaVariable input | input = ref.getAnInput() |
         asExpr() = ref.getGuard().getTest() and
         blocks(ref.getGuard().(ConditionGuardNode).getOutcome(), input.getAUse())
       )
     )
     or
     // 2) `nd` is an instance of an access path `p`, and dominated by a barrier for `p`
-    exists (AccessPath p, BasicBlock bb, ConditionGuardNode cond |
+    exists(AccessPath p, BasicBlock bb, ConditionGuardNode cond |
       nd = DataFlow::valueNode(p.getAnInstanceIn(bb)) and
       asExpr() = cond.getTest() and
       blocks(cond.getOutcome(), p.getAnInstance()) and
@@ -317,7 +310,6 @@ abstract class LabeledBarrierGuardNode extends BarrierGuardNode {
   abstract FlowLabel getALabel();
 }
 
-
 /**
  * A data flow edge that should be added to all data flow configurations in
  * addition to standard data flow edges.
@@ -326,11 +318,13 @@ abstract class LabeledBarrierGuardNode extends BarrierGuardNode {
  * of the standard library. Override `Configuration::isAdditionalFlowStep`
  * for analysis-specific flow steps.
  */
-abstract cached class AdditionalFlowStep extends DataFlow::Node {
+cached
+abstract class AdditionalFlowStep extends DataFlow::Node {
   /**
    * Holds if `pred` &rarr; `succ` should be considered a data flow edge.
    */
-  abstract cached predicate step(DataFlow::Node pred, DataFlow::Node succ);
+  cached
+  abstract predicate step(DataFlow::Node pred, DataFlow::Node succ);
 }
 
 /**
@@ -377,7 +371,7 @@ private class FlowStepThroughImport extends AdditionalFlowStep, DataFlow::ValueN
   override ImportSpecifier astNode;
 
   override predicate step(DataFlow::Node pred, DataFlow::Node succ) {
-    exists (SsaExplicitDefinition ssa |
+    exists(SsaExplicitDefinition ssa |
       pred = this and
       ssa.getDef() = astNode and
       succ = DataFlow::ssaDefinitionNode(ssa)
@@ -389,9 +383,7 @@ private class FlowStepThroughImport extends AdditionalFlowStep, DataFlow::ValueN
  * A partial call through the built-in `Function.prototype.bind`.
  */
 private class BindPartialCall extends AdditionalPartialInvokeNode, DataFlow::MethodCallNode {
-  BindPartialCall() {
-    getMethodName() = "bind"
-  }
+  BindPartialCall() { getMethodName() = "bind" }
 
   override predicate isPartialArgument(DataFlow::Node callback, DataFlow::Node argument, int index) {
     callback = getReceiver() and
@@ -403,13 +395,11 @@ private class BindPartialCall extends AdditionalPartialInvokeNode, DataFlow::Met
  * A partial call through `_.partial`.
  */
 private class LodashPartialCall extends AdditionalPartialInvokeNode {
-  LodashPartialCall() {
-    this = LodashUnderscore::member("partial").getACall()
-  }
+  LodashPartialCall() { this = LodashUnderscore::member("partial").getACall() }
 
   override predicate isPartialArgument(DataFlow::Node callback, DataFlow::Node argument, int index) {
     callback = getArgument(0) and
-    argument = getArgument(index+1)
+    argument = getArgument(index + 1)
   }
 }
 
@@ -417,15 +407,14 @@ private class LodashPartialCall extends AdditionalPartialInvokeNode {
  * A partial call through `ramda.partial`.
  */
 private class RamdaPartialCall extends AdditionalPartialInvokeNode {
-  RamdaPartialCall() {
-    this = DataFlow::moduleMember("ramda", "partial").getACall()
-  }
+  RamdaPartialCall() { this = DataFlow::moduleMember("ramda", "partial").getACall() }
 
   override predicate isPartialArgument(DataFlow::Node callback, DataFlow::Node argument, int index) {
     callback = getArgument(0) and
-    exists (DataFlow::ArrayCreationNode array |
+    exists(DataFlow::ArrayCreationNode array |
       array.flowsTo(getArgument(1)) and
-      argument = array.getElement(index))
+      argument = array.getElement(index)
+    )
   }
 }
 
@@ -435,32 +424,33 @@ private class RamdaPartialCall extends AdditionalPartialInvokeNode {
  *
  * Summary steps through function calls are not taken into account.
  */
-private predicate basicFlowStep(DataFlow::Node pred, DataFlow::Node succ, PathSummary summary,
-                                DataFlow::Configuration cfg) {
+private predicate basicFlowStep(
+  DataFlow::Node pred, DataFlow::Node succ, PathSummary summary, DataFlow::Configuration cfg
+) {
   isRelevantForward(pred, cfg) and
   (
-   // Local flow
-   exists (FlowLabel predlbl, FlowLabel succlbl |
-     localFlowStep(pred, succ, cfg, predlbl, succlbl) and
-     not cfg.isBarrier(pred, succ, predlbl) and
-     summary = MkPathSummary(false, false, predlbl, succlbl)
-   )
-   or
-   // Flow through properties of objects
-   propertyFlowStep(pred, succ) and
-   summary = PathSummary::level()
-   or
-   // Flow through global variables
-   globalFlowStep(pred, succ) and
-   summary = PathSummary::level()
-   or
-   // Flow into function
-   callStep(pred, succ) and
-   summary = PathSummary::call()
-   or
-   // Flow out of function
-   returnStep(pred, succ) and
-   summary = PathSummary::return()
+    // Local flow
+    exists(FlowLabel predlbl, FlowLabel succlbl |
+      localFlowStep(pred, succ, cfg, predlbl, succlbl) and
+      not cfg.isBarrier(pred, succ, predlbl) and
+      summary = MkPathSummary(false, false, predlbl, succlbl)
+    )
+    or
+    // Flow through properties of objects
+    propertyFlowStep(pred, succ) and
+    summary = PathSummary::level()
+    or
+    // Flow through global variables
+    globalFlowStep(pred, succ) and
+    summary = PathSummary::level()
+    or
+    // Flow into function
+    callStep(pred, succ) and
+    summary = PathSummary::call()
+    or
+    // Flow out of function
+    returnStep(pred, succ) and
+    summary = PathSummary::return()
   )
 }
 
@@ -471,8 +461,9 @@ private predicate basicFlowStep(DataFlow::Node pred, DataFlow::Node succ, PathSu
  * This predicate is field insensitive (it does not distinguish between `x` and `x.p`)
  * and hence should only be used for purposes of approximation.
  */
-private predicate exploratoryFlowStep(DataFlow::Node pred, DataFlow::Node succ,
-                                      DataFlow::Configuration cfg) {
+private predicate exploratoryFlowStep(
+  DataFlow::Node pred, DataFlow::Node succ, DataFlow::Configuration cfg
+) {
   basicFlowStep(pred, succ, _, cfg) or
   basicStoreStep(pred, succ, _) or
   loadStep(pred, succ, _)
@@ -506,9 +497,7 @@ private predicate isSink(DataFlow::Node nd, DataFlow::Configuration cfg, FlowLab
 private predicate isRelevantForward(DataFlow::Node nd, DataFlow::Configuration cfg) {
   isSource(nd, cfg, _)
   or
-  exists (DataFlow::Node mid |
-    isRelevantForward(mid, cfg) and exploratoryFlowStep(mid, nd, cfg)
-  )
+  exists(DataFlow::Node mid | isRelevantForward(mid, cfg) and exploratoryFlowStep(mid, nd, cfg))
 }
 
 /**
@@ -520,7 +509,7 @@ private predicate isRelevant(DataFlow::Node nd, DataFlow::Configuration cfg) {
   isRelevantForward(nd, cfg) and
   isSink(nd, cfg, _)
   or
-  exists (DataFlow::Node mid |
+  exists(DataFlow::Node mid |
     isRelevant(mid, cfg) and
     exploratoryFlowStep(nd, mid, cfg) and
     isRelevantForward(nd, cfg)
@@ -532,22 +521,24 @@ private predicate isRelevant(DataFlow::Node nd, DataFlow::Configuration cfg) {
  * either `pred` is an argument of `f` and `succ` the corresponding parameter, or
  * `pred` is a variable definition whose value is captured by `f` at `succ`.
  */
-private predicate callInputStep(Function f, DataFlow::Node invk,
-                                DataFlow::Node pred, DataFlow::Node succ,
-                                DataFlow::Configuration cfg) {
+private predicate callInputStep(
+  Function f, DataFlow::Node invk, DataFlow::Node pred, DataFlow::Node succ,
+  DataFlow::Configuration cfg
+) {
   (
-   isRelevant(pred, cfg) and
-   exists (Parameter parm |
-     argumentPassing(invk, pred, f, parm) and
-     succ = DataFlow::parameterNode(parm)
-   )
-   or
-   isRelevant(pred, cfg) and
-   exists (SsaDefinition prevDef, SsaDefinition def |
-     pred = DataFlow::ssaDefinitionNode(prevDef) and
-     calls(invk, f) and captures(f, prevDef, def) and
-     succ = DataFlow::ssaDefinitionNode(def)
-   )
+    isRelevant(pred, cfg) and
+    exists(Parameter parm |
+      argumentPassing(invk, pred, f, parm) and
+      succ = DataFlow::parameterNode(parm)
+    )
+    or
+    isRelevant(pred, cfg) and
+    exists(SsaDefinition prevDef, SsaDefinition def |
+      pred = DataFlow::ssaDefinitionNode(prevDef) and
+      calls(invk, f) and
+      captures(f, prevDef, def) and
+      succ = DataFlow::ssaDefinitionNode(def)
+    )
   ) and
   not cfg.isBarrier(succ) and
   not cfg.isBarrier(pred, succ)
@@ -562,13 +553,14 @@ private predicate callInputStep(Function f, DataFlow::Node invk,
  * into account.
  */
 pragma[nomagic]
-private predicate reachableFromInput(Function f, DataFlow::Node invk,
-                                     DataFlow::Node input, DataFlow::Node nd,
-                                     DataFlow::Configuration cfg, PathSummary summary) {
+private predicate reachableFromInput(
+  Function f, DataFlow::Node invk, DataFlow::Node input, DataFlow::Node nd,
+  DataFlow::Configuration cfg, PathSummary summary
+) {
   callInputStep(f, invk, input, nd, cfg) and
   summary = PathSummary::level()
   or
-  exists (DataFlow::Node mid, PathSummary oldSummary, PathSummary newSummary |
+  exists(DataFlow::Node mid, PathSummary oldSummary, PathSummary newSummary |
     reachableFromInput(f, invk, input, mid, cfg, oldSummary) and
     flowStep(mid, cfg, nd, newSummary) and
     summary = oldSummary.append(newSummary)
@@ -580,9 +572,10 @@ private predicate reachableFromInput(Function f, DataFlow::Node invk,
  * which is either an argument or a definition captured by the function, flows under
  * configuration `cfg`, possibly through callees.
  */
-private predicate flowThroughCall(DataFlow::Node input, DataFlow::Node invk,
-                                  DataFlow::Configuration cfg, PathSummary summary) {
-  exists (Function f, DataFlow::ValueNode ret |
+private predicate flowThroughCall(
+  DataFlow::Node input, DataFlow::Node invk, DataFlow::Configuration cfg, PathSummary summary
+) {
+  exists(Function f, DataFlow::ValueNode ret |
     ret.asExpr() = f.getAReturnedExpr() and
     calls(invk, f) and // Do not consider partial calls
     reachableFromInput(f, invk, input, ret, cfg, summary) and
@@ -596,12 +589,14 @@ private predicate flowThroughCall(DataFlow::Node input, DataFlow::Node invk,
  * along a path summarized by `summary`.
  */
 pragma[nomagic]
-private predicate storeStep(DataFlow::Node pred, DataFlow::Node succ, string prop,
-                            DataFlow::Configuration cfg, PathSummary summary) {
+private predicate storeStep(
+  DataFlow::Node pred, DataFlow::Node succ, string prop, DataFlow::Configuration cfg,
+  PathSummary summary
+) {
   basicStoreStep(pred, succ, prop) and
   summary = PathSummary::level()
   or
-  exists (Function f, DataFlow::Node mid, DataFlow::Node base |
+  exists(Function f, DataFlow::Node mid, DataFlow::Node base |
     // `f` stores its parameter `pred` in property `prop` of a value that it returns,
     // and `succ` is an invocation of `f`
     reachableFromInput(f, succ, pred, mid, cfg, summary) and
@@ -622,12 +617,14 @@ predicate returnedPropWrite(Function f, DataFlow::SourceNode base, string prop,
  * from the base of that write under configuration `cfg` (possibly through callees) along a
  * path summarized by `summary`.
  */
-private predicate reachableFromStoreBase(string prop, DataFlow::Node rhs, DataFlow::Node nd,
-                                         DataFlow::Configuration cfg, PathSummary summary) {
+private predicate reachableFromStoreBase(
+  string prop, DataFlow::Node rhs, DataFlow::Node nd, DataFlow::Configuration cfg,
+  PathSummary summary
+) {
   isRelevant(rhs, cfg) and
   storeStep(rhs, nd, prop, cfg, summary)
   or
-  exists (DataFlow::Node mid, PathSummary oldSummary, PathSummary newSummary |
+  exists(DataFlow::Node mid, PathSummary oldSummary, PathSummary newSummary |
     reachableFromStoreBase(prop, rhs, mid, cfg, oldSummary) and
     flowStep(mid, cfg, nd, newSummary) and
     summary = oldSummary.appendValuePreserving(newSummary)
@@ -641,10 +638,10 @@ private predicate reachableFromStoreBase(string prop, DataFlow::Node rhs, DataFl
  *
  * In other words, `pred` may flow to `succ` through a property.
  */
-private predicate flowThroughProperty(DataFlow::Node pred, DataFlow::Node succ,
-                                      DataFlow::Configuration cfg, PathSummary summary) {
-  exists (string prop, DataFlow::Node base |
-    reachableFromStoreBase(prop, pred, base, cfg, summary) |
+private predicate flowThroughProperty(
+  DataFlow::Node pred, DataFlow::Node succ, DataFlow::Configuration cfg, PathSummary summary
+) {
+  exists(string prop, DataFlow::Node base | reachableFromStoreBase(prop, pred, base, cfg, summary) |
     loadStep(base, succ, prop)
   )
 }
@@ -652,18 +649,19 @@ private predicate flowThroughProperty(DataFlow::Node pred, DataFlow::Node succ,
 /**
  * Holds if there is a flow step from `pred` to `succ` described by `summary`
  * under configuration `cfg`.
-*/
-private predicate flowStep(DataFlow::Node pred, DataFlow::Configuration cfg,
-                           DataFlow::Node succ, PathSummary summary) {
+ */
+private predicate flowStep(
+  DataFlow::Node pred, DataFlow::Configuration cfg, DataFlow::Node succ, PathSummary summary
+) {
   (
-   basicFlowStep(pred, succ, summary, cfg)
-   or
-   // Flow through a function that returns a value that depends on one of its arguments
-   // or a captured variable
-   flowThroughCall(pred, succ, cfg, summary)
-   or
-   // Flow through a property write/read pair
-   flowThroughProperty(pred, succ, cfg, summary)
+    basicFlowStep(pred, succ, summary, cfg)
+    or
+    // Flow through a function that returns a value that depends on one of its arguments
+    // or a captured variable
+    flowThroughCall(pred, succ, cfg, summary)
+    or
+    // Flow through a property write/read pair
+    flowThroughProperty(pred, succ, cfg, summary)
   ) and
   not cfg.isBarrier(succ) and
   not cfg.isBarrier(pred, succ) and
@@ -674,10 +672,11 @@ private predicate flowStep(DataFlow::Node pred, DataFlow::Configuration cfg,
  * Holds if `source` can flow to `sink` under configuration `cfg`
  * in zero or more steps.
  */
-pragma [nomagic]
-private predicate flowsTo(PathNode flowsource, DataFlow::Node source,
-                          SinkPathNode flowsink, DataFlow::Node sink,
-                          DataFlow::Configuration cfg) {
+pragma[nomagic]
+private predicate flowsTo(
+  PathNode flowsource, DataFlow::Node source, SinkPathNode flowsink, DataFlow::Node sink,
+  DataFlow::Configuration cfg
+) {
   flowsource = MkPathNode(source, cfg, _) and
   flowsink = flowsource.getASuccessor*() and
   flowsink = MkPathNode(sink, id(cfg), _)
@@ -688,16 +687,17 @@ private predicate flowsTo(PathNode flowsource, DataFlow::Node source,
  * `summary`.
  */
 pragma[nomagic]
-private predicate reachableFromSource(DataFlow::Node nd, DataFlow::Configuration cfg,
-                                      PathSummary summary) {
-  exists (FlowLabel lbl |
+private predicate reachableFromSource(
+  DataFlow::Node nd, DataFlow::Configuration cfg, PathSummary summary
+) {
+  exists(FlowLabel lbl |
     isSource(nd, cfg, lbl) and
     not cfg.isBarrier(nd) and
     not cfg.isLabeledBarrier(nd, lbl) and
     summary = MkPathSummary(false, false, lbl, lbl)
   )
   or
-  exists (DataFlow::Node pred, PathSummary oldSummary, PathSummary newSummary |
+  exists(DataFlow::Node pred, PathSummary oldSummary, PathSummary newSummary |
     reachableFromSource(pred, cfg, oldSummary) and
     flowStep(pred, cfg, nd, newSummary) and
     summary = oldSummary.append(newSummary)
@@ -708,14 +708,13 @@ private predicate reachableFromSource(DataFlow::Node nd, DataFlow::Configuration
  * Holds if `nd` can be reached from a source under `cfg`, and in turn a sink is
  * reachable from `nd`, where the path from the source to `nd` is summarized by `summary`.
  */
-private predicate onPath(DataFlow::Node nd, DataFlow::Configuration cfg,
-                         PathSummary summary) {
+private predicate onPath(DataFlow::Node nd, DataFlow::Configuration cfg, PathSummary summary) {
   reachableFromSource(nd, cfg, summary) and
   isSink(nd, cfg, summary.getEndLabel()) and
   not cfg.isBarrier(nd) and
   not cfg.isLabeledBarrier(nd, summary.getEndLabel())
   or
-  exists (DataFlow::Node mid, PathSummary stepSummary |
+  exists(DataFlow::Node mid, PathSummary stepSummary |
     reachableFromSource(nd, cfg, summary) and
     flowStep(nd, cfg, mid, stepSummary) and
     onPath(mid, cfg, summary.append(stepSummary))
@@ -727,7 +726,8 @@ private predicate onPath(DataFlow::Node nd, DataFlow::Configuration cfg,
  */
 private newtype TPathNode =
   MkPathNode(DataFlow::Node nd, DataFlow::Configuration cfg, PathSummary summary) {
-    isSource(_, cfg, _) and isSink(_, cfg, _) and
+    isSource(_, cfg, _) and
+    isSink(_, cfg, _) and
     onPath(nd, cfg, summary)
   }
 
@@ -738,9 +738,7 @@ private newtype TPathNode =
  * from computing a cross-product of all path nodes belonging to the same configuration.
  */
 bindingset[cfg, result]
-private DataFlow::Configuration id(DataFlow::Configuration cfg) {
-  result >= cfg and cfg >= result
-}
+private DataFlow::Configuration id(DataFlow::Configuration cfg) { result >= cfg and cfg >= result }
 
 /**
  * A data flow node on an inter-procedural path from a source to a sink.
@@ -751,33 +749,29 @@ private DataFlow::Configuration id(DataFlow::Configuration cfg) {
  */
 class PathNode extends TPathNode {
   DataFlow::Node nd;
+
   DataFlow::Configuration cfg;
+
   PathSummary summary;
 
   PathNode() { this = MkPathNode(nd, cfg, summary) }
 
   /** Gets the underlying data flow node of this path node. */
-  DataFlow::Node getNode() {
-    result = nd
-  }
+  DataFlow::Node getNode() { result = nd }
 
   /** Gets the underlying data flow tracking configuration of this path node. */
-  DataFlow::Configuration getConfiguration() {
-    result = cfg
-  }
+  DataFlow::Configuration getConfiguration() { result = cfg }
 
   /** Gets a successor node of this path node. */
   PathNode getASuccessor() {
-    exists (DataFlow::Node succ, PathSummary newSummary |
+    exists(DataFlow::Node succ, PathSummary newSummary |
       flowStep(nd, id(cfg), succ, newSummary) and
       result = MkPathNode(succ, id(cfg), summary.append(newSummary))
     )
   }
 
   /** Gets a textual representation of this path node. */
-  string toString() {
-    result = nd.toString()
-  }
+  string toString() { result = nd.toString() }
 
   /**
    * Holds if this path node is at the specified location.
@@ -786,8 +780,9 @@ class PathNode extends TPathNode {
    * For more information, see
    * [LGTM locations](https://lgtm.com/help/ql/locations).
    */
-  predicate hasLocationInfo(string filepath, int startline, int startcolumn,
-                            int endline, int endcolumn) {
+  predicate hasLocationInfo(
+    string filepath, int startline, int startcolumn, int endline, int endcolumn
+  ) {
     nd.hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
   }
 }
@@ -795,32 +790,20 @@ class PathNode extends TPathNode {
 /**
  * A path node corresponding to a flow source.
  */
-class SourcePathNode extends PathNode {
-  SourcePathNode() {
-    isSource(nd, cfg, _)
-  }
-}
+class SourcePathNode extends PathNode { SourcePathNode() { isSource(nd, cfg, _) } }
 
 /**
  * A path node corresponding to a flow sink.
  */
-class SinkPathNode extends PathNode {
-  SinkPathNode() {
-    isSink(nd, cfg, _)
-  }
-}
+class SinkPathNode extends PathNode { SinkPathNode() { isSink(nd, cfg, _) } }
 
 /**
  * Provides the query predicates needed to include a graph in a path-problem query.
  */
 module PathGraph {
   /** Holds if `nd` is a node in the graph of data flow path explanations. */
-  query predicate nodes(PathNode nd) {
-    any()
-  }
+  query predicate nodes(PathNode nd) { any() }
 
   /** Holds if `pred` &rarr; `succ` is an edge in the graph of data flow path explanations. */
-  query predicate edges(PathNode pred, PathNode succ) {
-    pred.getASuccessor() = succ
-  }
+  query predicate edges(PathNode pred, PathNode succ) { pred.getASuccessor() = succ }
 }
diff --git a/javascript/ql/src/semmle/javascript/dataflow/CustomAbstractValueDefinitions.qll b/javascript/ql/src/semmle/javascript/dataflow/CustomAbstractValueDefinitions.qll
index 0a069dbd87c5..4efc89ca329b 100644
--- a/javascript/ql/src/semmle/javascript/dataflow/CustomAbstractValueDefinitions.qll
+++ b/javascript/ql/src/semmle/javascript/dataflow/CustomAbstractValueDefinitions.qll
@@ -18,57 +18,37 @@ private import InferredTypes
  * Wraps a `CustomAbstractValueDefinition`.
  */
 class CustomAbstractValueFromDefinition extends AbstractValue, TCustomAbstractValueFromDefinition {
-
   CustomAbstractValueDefinition def;
 
-  CustomAbstractValueFromDefinition() {
-    this = TCustomAbstractValueFromDefinition(def)
-  }
+  CustomAbstractValueFromDefinition() { this = TCustomAbstractValueFromDefinition(def) }
 
-  override InferredType getType() {
-    result = def.getType()
-  }
+  override InferredType getType() { result = def.getType() }
 
-  override boolean getBooleanValue() {
-    result = def.getBooleanValue()
-  }
+  override boolean getBooleanValue() { result = def.getBooleanValue() }
 
-  override PrimitiveAbstractValue toPrimitive() {
-    result = def.toPrimitive()
-  }
+  override PrimitiveAbstractValue toPrimitive() { result = def.toPrimitive() }
 
-  override predicate isCoercibleToNumber() {
-    def.isCoercibleToNumber()
-  }
+  override predicate isCoercibleToNumber() { def.isCoercibleToNumber() }
 
-  override predicate isIndefinite(DataFlow::Incompleteness cause) {
-    def.isIndefinite(cause)
-  }
+  override predicate isIndefinite(DataFlow::Incompleteness cause) { def.isIndefinite(cause) }
 
-  override DefiniteAbstractValue getAPrototype() {
-    result = def.getAPrototype()
-  }
+  override DefiniteAbstractValue getAPrototype() { result = def.getAPrototype() }
 
-  override predicate hasLocationInfo(string f, int startline, int startcolumn, int endline, int endcolumn) {
+  override predicate hasLocationInfo(
+    string f, int startline, int startcolumn, int endline, int endcolumn
+  ) {
     def.getLocation().hasLocationInfo(f, startline, startcolumn, endline, endcolumn)
   }
 
-  override string toString() {
-    result = def.toString()
-  }
+  override string toString() { result = def.toString() }
 
   /**
    * Gets the definition that induces this value.
    */
-  CustomAbstractValueDefinition getDefinition() {
-   result = def
-  }
+  CustomAbstractValueDefinition getDefinition() { result = def }
 
   /** Holds if this is a value whose properties the type inference tracks. */
-  predicate shouldTrackProperties() {
-    def.shouldTrackProperties()
-  }
-
+  predicate shouldTrackProperties() { def.shouldTrackProperties() }
 }
 
 /**
@@ -80,7 +60,6 @@ class CustomAbstractValueFromDefinition extends AbstractValue, TCustomAbstractVa
  * of the standard library.
  */
 abstract class CustomAbstractValueDefinition extends Locatable {
-
   /**
    * Gets the type of some concrete value represented by the induced
    * abstract value.
@@ -113,16 +92,14 @@ abstract class CustomAbstractValueDefinition extends Locatable {
    * Holds if the induced abstract value is an indefinite value arising
    * from the incompleteness `cause`.
    */
-  predicate isIndefinite(DataFlow::Incompleteness cause) {
-    none()
-  }
+  predicate isIndefinite(DataFlow::Incompleteness cause) { none() }
 
   /**
    * Gets an abstract value that represents a prototype object of the
    * induced abstract value.
    */
   AbstractValue getAPrototype() {
-    exists (AbstractProtoProperty proto |
+    exists(AbstractProtoProperty proto |
       proto.getBase() = getAbstractValue() and
       result = proto.getAValue()
     )
@@ -137,22 +114,17 @@ abstract class CustomAbstractValueDefinition extends Locatable {
 
   /** Holds if this is a value whose properties the type inference tracks. */
   abstract predicate shouldTrackProperties();
-
 }
 
 /**
  * Flow analysis for custom abstract values.
  */
 class CustomAbstractValueFromDefinitionNode extends DataFlow::AnalyzedNode, DataFlow::ValueNode {
-
   CustomAbstractValueFromDefinition val;
 
   CustomAbstractValueFromDefinitionNode() {
     val = TCustomAbstractValueFromDefinition(this.getAstNode())
   }
 
-  override AbstractValue getALocalValue() {
-    result = val
-  }
-
-}
\ No newline at end of file
+  override AbstractValue getALocalValue() { result = val }
+}
diff --git a/javascript/ql/src/semmle/javascript/dataflow/DataFlow.qll b/javascript/ql/src/semmle/javascript/dataflow/DataFlow.qll
index e0f14d73d174..ac27a0653262 100644
--- a/javascript/ql/src/semmle/javascript/dataflow/DataFlow.qll
+++ b/javascript/ql/src/semmle/javascript/dataflow/DataFlow.qll
@@ -21,21 +21,23 @@
 import javascript
 
 module DataFlow {
-  private cached newtype TNode =
-     TValueNode(AST::ValueNode nd)
-  or TSsaDefNode(SsaDefinition d)
-  or TPropNode(@property p)
-  or TRestPatternNode(DestructuringPattern dp, Expr rest) { rest = dp.getRest() }
-  or TDestructuringPatternNode(DestructuringPattern dp)
-  or TElementPatternNode(ArrayPattern ap, Expr p) { p = ap.getElement(_) }
-  or TElementNode(ArrayExpr arr, Expr e) { e = arr.getAnElement() }
-  or TReflectiveCallNode(MethodCallExpr ce, string kind) {
-       ce.getMethodName() = kind and (kind = "call" or kind = "apply")
-     }
-  or TThisNode(StmtContainer f) { f.(Function).getThisBinder() = f or f instanceof TopLevel }
-  or TUnusedParameterNode(SimpleParameter p) {
-    not exists (SsaExplicitDefinition ssa | p = ssa.getDef())
-  }
+  cached
+  private newtype TNode =
+    TValueNode(AST::ValueNode nd) or
+    TSsaDefNode(SsaDefinition d) or
+    TPropNode(@property p) or
+    TRestPatternNode(DestructuringPattern dp, Expr rest) { rest = dp.getRest() } or
+    TDestructuringPatternNode(DestructuringPattern dp) or
+    TElementPatternNode(ArrayPattern ap, Expr p) { p = ap.getElement(_) } or
+    TElementNode(ArrayExpr arr, Expr e) { e = arr.getAnElement() } or
+    TReflectiveCallNode(MethodCallExpr ce, string kind) {
+      ce.getMethodName() = kind and
+      (kind = "call" or kind = "apply")
+    } or
+    TThisNode(StmtContainer f) { f.(Function).getThisBinder() = f or f instanceof TopLevel } or
+    TUnusedParameterNode(SimpleParameter p) {
+      not exists(SsaExplicitDefinition ssa | p = ssa.getDef())
+    }
 
   /**
    * A node in the data flow graph.
@@ -44,23 +46,17 @@ module DataFlow {
     /**
      * Gets a data flow node from which data may flow to this node in one local step.
      */
-    Node getAPredecessor() {
-      localFlowStep(result, this)
-    }
+    Node getAPredecessor() { localFlowStep(result, this) }
 
     /**
      * Gets a data flow node to which data may flow from this node in one local step.
      */
-    Node getASuccessor() {
-      localFlowStep(this, result)
-    }
+    Node getASuccessor() { localFlowStep(this, result) }
 
     /**
      * Gets a source node from which data may flow to this node in zero or more local steps.
      */
-    SourceNode getALocalSource() {
-      result.flowsTo(this)
-    }
+    SourceNode getALocalSource() { result.flowsTo(this) }
 
     /**
      * Holds if the flow information for this node is incomplete.
@@ -75,14 +71,10 @@ module DataFlow {
      * `p.getALocalSource()` does _not_ return the corresponding argument, and
      * `p.isIncomplete("call")` holds.
      */
-    predicate isIncomplete(Incompleteness cause) {
-      isIncomplete(this, cause)
-    }
+    predicate isIncomplete(Incompleteness cause) { isIncomplete(this, cause) }
 
     /** Gets type inference results for this data flow node. */
-    AnalyzedNode analyze() {
-      result = this
-    }
+    AnalyzedNode analyze() { result = this }
 
     /** Gets the expression corresponding to this data flow node, if any. */
     Expr asExpr() { this = TValueNode(result) }
@@ -100,14 +92,10 @@ module DataFlow {
      * Holds if this data flow node accesses the global variable `g`, either directly
      * or through the `window` object.
      */
-    predicate accessesGlobal(string g) {
-      globalVarRef(g).flowsTo(this)
-    }
+    predicate accessesGlobal(string g) { globalVarRef(g).flowsTo(this) }
 
     /** Holds if this node may evaluate to the string `s`. */
-    predicate mayHaveStringValue(string s) {
-      getAPredecessor().mayHaveStringValue(s)
-    }
+    predicate mayHaveStringValue(string s) { getAPredecessor().mayHaveStringValue(s) }
 
     /** Holds if this node may evaluate to the Boolean value `b`. */
     predicate mayHaveBooleanValue(boolean b) {
@@ -117,9 +105,7 @@ module DataFlow {
     /**
      * Holds if this expression may refer to the initial value of parameter `p`.
      */
-    predicate mayReferToParameter(Parameter p) {
-      parameterNode(p).(SourceNode).flowsTo(this)
-    }
+    predicate mayReferToParameter(Parameter p) { parameterNode(p).(SourceNode).flowsTo(this) }
 
     /**
      * Holds if this element is at the specified location.
@@ -128,37 +114,30 @@ module DataFlow {
      * For more information, see
      * [LGTM locations](https://lgtm.com/help/ql/locations).
      */
-    predicate hasLocationInfo(string filepath, int startline, int startcolumn,
-                              int endline, int endcolumn) {
+    predicate hasLocationInfo(
+      string filepath, int startline, int startcolumn, int endline, int endcolumn
+    ) {
       filepath = "" and
-      startline = 0 and startcolumn = 0 and
-      endline = 0 and endcolumn = 0
+      startline = 0 and
+      startcolumn = 0 and
+      endline = 0 and
+      endcolumn = 0
     }
 
     /** Gets the file this data flow node comes from. */
-    File getFile() {
-      hasLocationInfo(result.getAbsolutePath(), _, _, _, _)
-    }
+    File getFile() { hasLocationInfo(result.getAbsolutePath(), _, _, _, _) }
 
     /** Gets the start line of this data flow node. */
-    int getStartLine() {
-      hasLocationInfo(_, result, _, _, _)
-    }
+    int getStartLine() { hasLocationInfo(_, result, _, _, _) }
 
     /** Gets the start column of this data flow node. */
-    int getStartColumn() {
-      hasLocationInfo(_, _, result, _, _)
-    }
+    int getStartColumn() { hasLocationInfo(_, _, result, _, _) }
 
     /** Gets the end line of this data flow node. */
-    int getEndLine() {
-      hasLocationInfo(_, _, _, result, _)
-    }
+    int getEndLine() { hasLocationInfo(_, _, _, result, _) }
 
     /** Gets the end column of this data flow node. */
-    int getEndColumn() {
-      hasLocationInfo(_, _, _, _, result)
-    }
+    int getEndColumn() { hasLocationInfo(_, _, _, _, result) }
 
     /** Gets a textual representation of this element. */
     string toString() { none() }
@@ -171,32 +150,25 @@ module DataFlow {
   class ValueNode extends Node, TValueNode {
     AST::ValueNode astNode;
 
-    ValueNode() {
-      this = TValueNode(astNode)
-    }
+    ValueNode() { this = TValueNode(astNode) }
 
     /** Gets the expression or declaration this node corresponds to. */
-    override AST::ValueNode getAstNode() {
-      result = astNode
-    }
+    override AST::ValueNode getAstNode() { result = astNode }
 
     override predicate mayHaveStringValue(string s) {
       Node.super.mayHaveStringValue(s) or
       astNode.(ConstantString).getStringValue() = s
     }
 
-    override BasicBlock getBasicBlock() {
-      astNode = result.getANode()
-    }
+    override BasicBlock getBasicBlock() { astNode = result.getANode() }
 
-    override predicate hasLocationInfo(string filepath, int startline, int startcolumn,
-                                       int endline, int endcolumn) {
+    override predicate hasLocationInfo(
+      string filepath, int startline, int startcolumn, int endline, int endcolumn
+    ) {
       astNode.getLocation().hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
     }
 
-    override string toString() {
-      result = astNode.toString()
-    }
+    override string toString() { result = astNode.toString() }
   }
 
   /**
@@ -208,26 +180,19 @@ module DataFlow {
     SsaDefinitionNode() { this = TSsaDefNode(ssa) }
 
     /** Gets the SSA variable defined at this data flow node. */
-    SsaVariable getSsaVariable() {
-      result = ssa.getVariable()
-    }
+    SsaVariable getSsaVariable() { result = ssa.getVariable() }
 
-    override BasicBlock getBasicBlock() {
-      result = ssa.getBasicBlock()
-    }
+    override BasicBlock getBasicBlock() { result = ssa.getBasicBlock() }
 
-    override predicate hasLocationInfo(string filepath, int startline, int startcolumn,
-                                       int endline, int endcolumn) {
+    override predicate hasLocationInfo(
+      string filepath, int startline, int startcolumn, int endline, int endcolumn
+    ) {
       ssa.hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
     }
 
-    override string toString() {
-      result = ssa.getSourceVariable().getName()
-    }
+    override string toString() { result = ssa.getSourceVariable().getName() }
 
-    override ASTNode getAstNode() {
-      none()
-    }
+    override ASTNode getAstNode() { none() }
   }
 
   /**
@@ -238,22 +203,20 @@ module DataFlow {
 
     PropNode() { this = TPropNode(prop) }
 
-    override BasicBlock getBasicBlock() {
-      result = prop.(ControlFlowNode).getBasicBlock()
-    }
+    override BasicBlock getBasicBlock() { result = prop.(ControlFlowNode).getBasicBlock() }
 
-    override predicate hasLocationInfo(string filepath, int startline, int startcolumn,
-                                       int endline, int endcolumn) {
-      prop.(Locatable).getLocation().hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
+    override predicate hasLocationInfo(
+      string filepath, int startline, int startcolumn, int endline, int endcolumn
+    ) {
+      prop
+          .(Locatable)
+          .getLocation()
+          .hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
     }
 
-    override string toString() {
-      result = prop.(ASTNode).toString()
-    }
+    override string toString() { result = prop.(ASTNode).toString() }
 
-    override ASTNode getAstNode() {
-      result = prop
-    }
+    override ASTNode getAstNode() { result = prop }
   }
 
   /**
@@ -262,26 +225,22 @@ module DataFlow {
    */
   private class RestPatternNode extends Node, TRestPatternNode {
     DestructuringPattern pattern;
+
     Expr rest;
 
     RestPatternNode() { this = TRestPatternNode(pattern, rest) }
 
-    override BasicBlock getBasicBlock() {
-      result = rest.getBasicBlock()
-    }
+    override BasicBlock getBasicBlock() { result = rest.getBasicBlock() }
 
-    override predicate hasLocationInfo(string filepath, int startline, int startcolumn,
-                                       int endline, int endcolumn) {
+    override predicate hasLocationInfo(
+      string filepath, int startline, int startcolumn, int endline, int endcolumn
+    ) {
       rest.getLocation().hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
     }
 
-    override string toString() {
-      result = "..." + rest.toString()
-    }
+    override string toString() { result = "..." + rest.toString() }
 
-    override ASTNode getAstNode() {
-      result = rest
-    }
+    override ASTNode getAstNode() { result = rest }
   }
 
   /**
@@ -293,22 +252,17 @@ module DataFlow {
 
     DestructuringPatternNode() { this = TDestructuringPatternNode(pattern) }
 
-    override BasicBlock getBasicBlock() {
-      result = pattern.getBasicBlock()
-    }
+    override BasicBlock getBasicBlock() { result = pattern.getBasicBlock() }
 
-    override predicate hasLocationInfo(string filepath, int startline, int startcolumn,
-                                       int endline, int endcolumn) {
+    override predicate hasLocationInfo(
+      string filepath, int startline, int startcolumn, int endline, int endcolumn
+    ) {
       pattern.getLocation().hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
     }
 
-    override string toString() {
-      result = pattern.toString()
-    }
+    override string toString() { result = pattern.toString() }
 
-    override ASTNode getAstNode() {
-      result = pattern
-    }
+    override ASTNode getAstNode() { result = pattern }
   }
 
   /**
@@ -317,26 +271,22 @@ module DataFlow {
    */
   private class ElementPatternNode extends Node, TElementPatternNode {
     ArrayPattern pattern;
+
     Expr elt;
 
     ElementPatternNode() { this = TElementPatternNode(pattern, elt) }
 
-    override BasicBlock getBasicBlock() {
-      result = elt.getBasicBlock()
-    }
+    override BasicBlock getBasicBlock() { result = elt.getBasicBlock() }
 
-    override predicate hasLocationInfo(string filepath, int startline, int startcolumn,
-                                       int endline, int endcolumn) {
+    override predicate hasLocationInfo(
+      string filepath, int startline, int startcolumn, int endline, int endcolumn
+    ) {
       elt.getLocation().hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
     }
 
-    override string toString() {
-      result = elt.toString()
-    }
+    override string toString() { result = elt.toString() }
 
-    override ASTNode getAstNode() {
-      result = elt
-    }
+    override ASTNode getAstNode() { result = elt }
   }
 
   /**
@@ -349,28 +299,22 @@ module DataFlow {
    */
   private class ElementNode extends Node, TElementNode {
     ArrayExpr arr;
+
     Expr elt;
 
-    ElementNode() {
-      this = TElementNode(arr, elt)
-    }
+    ElementNode() { this = TElementNode(arr, elt) }
 
-    override BasicBlock getBasicBlock() {
-      result = elt.getBasicBlock()
-    }
+    override BasicBlock getBasicBlock() { result = elt.getBasicBlock() }
 
-    override predicate hasLocationInfo(string filepath, int startline, int startcolumn,
-                                       int endline, int endcolumn) {
+    override predicate hasLocationInfo(
+      string filepath, int startline, int startcolumn, int endline, int endcolumn
+    ) {
       elt.getLocation().hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
     }
 
-    override string toString() {
-      result = elt.toString()
-    }
+    override string toString() { result = elt.toString() }
 
-    override ASTNode getAstNode() {
-      result = elt
-    }
+    override ASTNode getAstNode() { result = elt }
   }
 
   /**
@@ -379,22 +323,20 @@ module DataFlow {
    */
   private class ReflectiveCallNode extends Node, TReflectiveCallNode {
     MethodCallExpr call;
+
     string kind;
 
     ReflectiveCallNode() { this = TReflectiveCallNode(call, kind) }
 
-    override BasicBlock getBasicBlock() {
-      result = call.getBasicBlock()
-    }
+    override BasicBlock getBasicBlock() { result = call.getBasicBlock() }
 
-    override predicate hasLocationInfo(string filepath, int startline, int startcolumn,
-                                       int endline, int endcolumn) {
+    override predicate hasLocationInfo(
+      string filepath, int startline, int startcolumn, int endline, int endcolumn
+    ) {
       call.getLocation().hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
     }
 
-    override string toString() {
-      result = "reflective call"
-    }
+    override string toString() { result = "reflective call" }
   }
 
   /**
@@ -431,9 +373,7 @@ module DataFlow {
      * Holds if this data flow node accesses property `p` on base node `base`.
      */
     pragma[noinline]
-    predicate accesses(Node base, string p) {
-      getBase() = base and getPropertyName() = p
-    }
+    predicate accesses(Node base, string p) { getBase() = base and getPropertyName() = p }
   }
 
   /**
@@ -474,25 +414,15 @@ module DataFlow {
 
     PropLValueAsPropWrite() { astNode instanceof LValue }
 
-    override Node getBase() {
-      result = valueNode(astNode.getBase())
-    }
+    override Node getBase() { result = valueNode(astNode.getBase()) }
 
-    override Expr getPropertyNameExpr() {
-      result = astNode.getPropertyNameExpr()
-    }
+    override Expr getPropertyNameExpr() { result = astNode.getPropertyNameExpr() }
 
-    override string getPropertyName() {
-      result = astNode.getPropertyName()
-    }
+    override string getPropertyName() { result = astNode.getPropertyName() }
 
-    override Node getRhs() {
-      result = valueNode(astNode.(LValue).getRhs())
-    }
+    override Node getRhs() { result = valueNode(astNode.(LValue).getRhs()) }
 
-    override ControlFlowNode getWriteNode() {
-      result = astNode.(LValue).getDefNode()
-    }
+    override ControlFlowNode getWriteNode() { result = astNode.(LValue).getDefNode() }
   }
 
   /**
@@ -502,25 +432,15 @@ module DataFlow {
   private class PropInitAsPropWrite extends PropWrite, PropNode {
     override Property prop;
 
-    override Node getBase() {
-      result = valueNode(prop.getObjectExpr())
-    }
+    override Node getBase() { result = valueNode(prop.getObjectExpr()) }
 
-    override Expr getPropertyNameExpr() {
-      result = prop.getNameExpr()
-    }
+    override Expr getPropertyNameExpr() { result = prop.getNameExpr() }
 
-    override string getPropertyName() {
-      result = prop.getName()
-    }
+    override string getPropertyName() { result = prop.getName() }
 
-    override Node getRhs() {
-      result = valueNode(prop.(ValueProperty).getInit())
-    }
+    override Node getRhs() { result = valueNode(prop.(ValueProperty).getInit()) }
 
-    override ControlFlowNode getWriteNode() {
-      result = prop
-    }
+    override ControlFlowNode getWriteNode() { result = prop }
   }
 
   /**
@@ -532,28 +452,20 @@ module DataFlow {
 
     ObjectDefinePropertyAsPropWrite() { odp = this }
 
-    override Node getBase() {
-      result = odp.getBaseObject()
-    }
+    override Node getBase() { result = odp.getBaseObject() }
 
-    override Expr getPropertyNameExpr() {
-      result = odp.getArgument(1).asExpr()
-    }
+    override Expr getPropertyNameExpr() { result = odp.getArgument(1).asExpr() }
 
-    override string getPropertyName() {
-      result = odp.getPropertyName()
-    }
+    override string getPropertyName() { result = odp.getPropertyName() }
 
     override Node getRhs() {
-      exists (ObjectLiteralNode propdesc |
+      exists(ObjectLiteralNode propdesc |
         propdesc.flowsTo(odp.getPropertyDescriptor()) and
         propdesc.hasPropertyWrite("value", result)
       )
     }
 
-    override ControlFlowNode getWriteNode() {
-      result = odp.getAstNode()
-    }
+    override ControlFlowNode getWriteNode() { result = odp.getAstNode() }
   }
 
   /**
@@ -568,22 +480,16 @@ module DataFlow {
       result = valueNode(prop.getDeclaringClass())
     }
 
-    override Expr getPropertyNameExpr() {
-      result = prop.getNameExpr()
-    }
+    override Expr getPropertyNameExpr() { result = prop.getNameExpr() }
 
-    override string getPropertyName() {
-      result = prop.getName()
-    }
+    override string getPropertyName() { result = prop.getName() }
 
     override Node getRhs() {
       not prop instanceof AccessorMethodDefinition and
       result = valueNode(prop.getInit())
     }
 
-    override ControlFlowNode getWriteNode() {
-      result = prop
-    }
+    override ControlFlowNode getWriteNode() { result = prop }
   }
 
   /**
@@ -593,32 +499,21 @@ module DataFlow {
   private class JsxAttributeAsPropWrite extends PropWrite, PropNode {
     override JSXAttribute prop;
 
-    override Node getBase() {
-      result = valueNode(prop.getElement())
-    }
+    override Node getBase() { result = valueNode(prop.getElement()) }
 
-    override Expr getPropertyNameExpr() {
-      result = prop.getNameExpr()
-    }
+    override Expr getPropertyNameExpr() { result = prop.getNameExpr() }
 
-    override string getPropertyName() {
-      result = prop.getName()
-    }
+    override string getPropertyName() { result = prop.getName() }
 
-    override Node getRhs() {
-      result = valueNode(prop.getValue())
-    }
+    override Node getRhs() { result = valueNode(prop.getValue()) }
 
-    override ControlFlowNode getWriteNode() {
-      result = prop
-    }
+    override ControlFlowNode getWriteNode() { result = prop }
   }
 
   /**
    * A data flow node that reads an object property.
    */
-  abstract class PropRead extends PropRef, SourceNode {
-  }
+  abstract class PropRead extends PropRef, SourceNode { }
 
   /**
    * A property access in rvalue position.
@@ -628,17 +523,11 @@ module DataFlow {
 
     PropRValueAsPropRead() { astNode instanceof RValue }
 
-    override Node getBase() {
-      result = valueNode(astNode.getBase())
-    }
+    override Node getBase() { result = valueNode(astNode.getBase()) }
 
-    override Expr getPropertyNameExpr() {
-      result = astNode.getPropertyNameExpr()
-    }
+    override Expr getPropertyNameExpr() { result = astNode.getPropertyNameExpr() }
 
-    override string getPropertyName() {
-      result = astNode.getPropertyName()
-    }
+    override string getPropertyName() { result = astNode.getPropertyName() }
   }
 
   /**
@@ -649,21 +538,13 @@ module DataFlow {
     override PropertyPattern prop;
 
     /** Gets the value pattern of this property pattern. */
-    Expr getValuePattern() {
-      result = prop.getValuePattern()
-    }
+    Expr getValuePattern() { result = prop.getValuePattern() }
 
-    override Node getBase() {
-      result = TDestructuringPatternNode(prop.getObjectPattern())
-    }
+    override Node getBase() { result = TDestructuringPatternNode(prop.getObjectPattern()) }
 
-    override Expr getPropertyNameExpr() {
-      result = prop.getNameExpr()
-    }
+    override Expr getPropertyNameExpr() { result = prop.getNameExpr() }
 
-    override string getPropertyName() {
-      result = prop.getName()
-    }
+    override string getPropertyName() { result = prop.getName() }
   }
 
   /**
@@ -672,9 +553,7 @@ module DataFlow {
    * for `[ ...elts ] = arr`.
    */
   private class RestPatternAsPropRead extends PropRead, RestPatternNode {
-    override Node getBase() {
-      result = TDestructuringPatternNode(pattern)
-    }
+    override Node getBase() { result = TDestructuringPatternNode(pattern) }
 
     override Expr getPropertyNameExpr() { none() }
 
@@ -690,9 +569,7 @@ module DataFlow {
    * instead treating it as a read of an unknown property.
    */
   private class ElementPatternAsPropRead extends PropRead, ElementPatternNode {
-    override Node getBase() {
-      result = TDestructuringPatternNode(pattern)
-    }
+    override Node getBase() { result = TDestructuringPatternNode(pattern) }
 
     override Expr getPropertyNameExpr() { none() }
 
@@ -708,24 +585,17 @@ module DataFlow {
   private class UnusedParameterNode extends DataFlow::Node, TUnusedParameterNode {
     SimpleParameter p;
 
-    UnusedParameterNode() {
-      this = TUnusedParameterNode(p)
-    }
+    UnusedParameterNode() { this = TUnusedParameterNode(p) }
 
-    override string toString() {
-      result = p.toString()
-    }
+    override string toString() { result = p.toString() }
 
-    override ASTNode getAstNode() {
-      result = p
-    }
+    override ASTNode getAstNode() { result = p }
 
-    override BasicBlock getBasicBlock() {
-      result = p.getBasicBlock()
-    }
+    override BasicBlock getBasicBlock() { result = p.getBasicBlock() }
 
-    override predicate hasLocationInfo(string filepath, int startline, int startcolumn,
-                                       int endline, int endcolumn) {
+    override predicate hasLocationInfo(
+      string filepath, int startline, int startcolumn, int endline, int endcolumn
+    ) {
       p.getLocation().hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
     }
   }
@@ -779,8 +649,7 @@ module DataFlow {
     /**
      * A data flow node representing a function invocation with `new`.
      */
-    abstract class NewNodeDef extends InvokeNodeDef {
-    }
+    abstract class NewNodeDef extends InvokeNodeDef { }
 
     /**
      * A data flow node representing an explicit (that is, non-reflective) function invocation.
@@ -788,20 +657,17 @@ module DataFlow {
     class ExplicitInvokeNode extends InvokeNodeDef, DataFlow::ValueNode {
       override InvokeExpr astNode;
 
-      override string getCalleeName() {
-        result = astNode.getCalleeName()
-      }
+      override string getCalleeName() { result = astNode.getCalleeName() }
 
-      override DataFlow::Node getCalleeNode() {
-        result = DataFlow::valueNode(astNode.getCallee())
-      }
+      override DataFlow::Node getCalleeNode() { result = DataFlow::valueNode(astNode.getCallee()) }
 
       override DataFlow::Node getArgument(int i) {
-        not astNode.isSpreadArgument([0..i]) and result = DataFlow::valueNode(astNode.getArgument(i))
+        not astNode.isSpreadArgument([0 .. i]) and
+        result = DataFlow::valueNode(astNode.getArgument(i))
       }
 
       override DataFlow::Node getAnArgument() {
-        exists (Expr arg | arg = astNode.getAnArgument() |
+        exists(Expr arg | arg = astNode.getAnArgument() |
           not arg instanceof SpreadElement and
           result = DataFlow::valueNode(arg)
         )
@@ -815,16 +681,16 @@ module DataFlow {
     /**
      * A data flow node representing an explicit (that is, non-reflective) function call.
      */
-    class ExplicitCallNode extends CallNodeDef, ExplicitInvokeNode {
-      override CallExpr astNode;
-    }
+    class ExplicitCallNode extends CallNodeDef, ExplicitInvokeNode { override CallExpr astNode; }
 
     /**
      * A data flow node representing an explicit (that is, non-reflective) method call.
      */
     private class ExplicitMethodCallNode extends MethodCallNodeDef, ExplicitCallNode {
       override MethodCallExpr astNode;
+
       override DataFlow::Node getReceiver() { result = DataFlow::valueNode(astNode.getReceiver()) }
+
       override string getMethodName() { result = astNode.getMethodName() }
     }
 
@@ -840,24 +706,19 @@ module DataFlow {
      */
     private class ReflectiveCallNodeDef extends CallNodeDef {
       ExplicitMethodCallNode originalCall;
+
       string kind;
 
-      ReflectiveCallNodeDef() {
-        this = TReflectiveCallNode(originalCall.asExpr(), kind)
-      }
+      ReflectiveCallNodeDef() { this = TReflectiveCallNode(originalCall.asExpr(), kind) }
 
       override string getCalleeName() { none() }
 
-      override DataFlow::Node getCalleeNode() {
-        result = originalCall.getReceiver()
-      }
+      override DataFlow::Node getCalleeNode() { result = originalCall.getReceiver() }
 
-      override DataFlow::Node getReceiver() {
-        result = originalCall.getArgument(0)
-      }
+      override DataFlow::Node getReceiver() { result = originalCall.getArgument(0) }
 
       override DataFlow::Node getArgument(int i) {
-        i >= 0 and kind = "call" and result = originalCall.getArgument(i+1)
+        i >= 0 and kind = "call" and result = originalCall.getArgument(i + 1)
       }
 
       override DataFlow::Node getAnArgument() {
@@ -865,7 +726,7 @@ module DataFlow {
       }
 
       override int getNumArgument() {
-        result >= 0 and kind = "call" and result = originalCall.getNumArgument()-1
+        result >= 0 and kind = "call" and result = originalCall.getNumArgument() - 1
       }
     }
   }
@@ -879,26 +740,15 @@ module DataFlow {
    * instead treating it as a write of an unknown property.
    */
   private class ElementNodeAsPropWrite extends PropWrite, ElementNode {
-    override Expr getPropertyNameExpr() {
-      none()
-    }
-
-    override string getPropertyName() {
-      none()
-    }
+    override Expr getPropertyNameExpr() { none() }
 
-    override Node getRhs() {
-      result = valueNode(elt)
-    }
+    override string getPropertyName() { none() }
 
-    override Node getBase() {
-      result = valueNode(arr)
-    }
+    override Node getRhs() { result = valueNode(elt) }
 
-    override ControlFlowNode getWriteNode() {
-      result = arr
-    }
+    override Node getBase() { result = valueNode(arr) }
 
+    override ControlFlowNode getWriteNode() { result = arr }
   }
 
   /**
@@ -910,20 +760,16 @@ module DataFlow {
   ValueNode valueNode(ASTNode nd) { result.getAstNode() = nd }
 
   /** Gets the data flow node corresponding to `ssa`. */
-  SsaDefinitionNode ssaDefinitionNode(SsaDefinition ssa) {
-    result = TSsaDefNode(ssa)
-  }
+  SsaDefinitionNode ssaDefinitionNode(SsaDefinition ssa) { result = TSsaDefNode(ssa) }
 
   /** Gets the node corresponding to the initialization of parameter `p`. */
-  ParameterNode parameterNode(Parameter p) {
-    result.getParameter() = p
-  }
+  ParameterNode parameterNode(Parameter p) { result.getParameter() = p }
 
   /**
    * INTERNAL: Use `parameterNode(Parameter)` instead.
    */
   predicate parameterNode(DataFlow::Node nd, Parameter p) {
-    exists (SsaExplicitDefinition ssa |
+    exists(SsaExplicitDefinition ssa |
       nd = ssaDefinitionNode(ssa) and
       p = ssa.getDef() and
       p instanceof SimpleParameter
@@ -937,9 +783,7 @@ module DataFlow {
   /**
    * INTERNAL: Use `thisNode(StmtContainer container)` instead.
    */
-  predicate thisNode(DataFlow::Node node, StmtContainer container) {
-    node = TThisNode(container)
-  }
+  predicate thisNode(DataFlow::Node node, StmtContainer container) { node = TThisNode(container) }
 
   /**
    * A classification of flows that are not modeled, or only modeled incompletely, by
@@ -989,18 +833,19 @@ module DataFlow {
   cached
   predicate localFlowStep(Node pred, Node succ) {
     // flow into local variables
-    exists (SsaDefinition ssa | succ = TSsaDefNode(ssa) |
+    exists(SsaDefinition ssa | succ = TSsaDefNode(ssa) |
       // from the rhs of an explicit definition into the variable
-      exists (SsaExplicitDefinition def | def = ssa |
+      exists(SsaExplicitDefinition def | def = ssa |
         pred = defSourceNode(def.getDef(), def.getSourceVariable())
       )
       or
       // from any explicit definition or implicit init of a captured variable into
       // the capturing definition
-      exists (SsaSourceVariable v, SsaDefinition predDef |
+      exists(SsaSourceVariable v, SsaDefinition predDef |
         v = ssa.(SsaVariableCapture).getSourceVariable() and
         predDef.getSourceVariable() = v and
-        pred = TSsaDefNode(predDef) |
+        pred = TSsaDefNode(predDef)
+      |
         predDef instanceof SsaExplicitDefinition or
         predDef instanceof SsaImplicitInit
       )
@@ -1010,13 +855,14 @@ module DataFlow {
     )
     or
     // flow out of local variables
-    exists (SsaVariable v |
+    exists(SsaVariable v |
       pred = TSsaDefNode(v.getDefinition()) and
       succ = valueNode(v.getAUse())
     )
     or
-    exists (Expr predExpr, Expr succExpr |
-      pred = valueNode(predExpr) and succ = valueNode(succExpr) |
+    exists(Expr predExpr, Expr succExpr |
+      pred = valueNode(predExpr) and succ = valueNode(succExpr)
+    |
       predExpr = succExpr.(ParExpr).getExpression()
       or
       predExpr = succExpr.(SeqExpr).getLastOperand()
@@ -1033,22 +879,23 @@ module DataFlow {
       or
       predExpr = succExpr.(ExpressionWithTypeArguments).getExpression()
       or
-      exists (Function f |
+      exists(Function f |
         predExpr = f.getAReturnedExpr() and
         localCall(succExpr, f)
       )
     )
     or
-    exists (VarDef def |
+    exists(VarDef def |
       // from `e` to `{ p: x }` in `{ p: x } = e`
       pred = valueNode(defSourceNode(def)) and
       succ = TDestructuringPatternNode(def.getTarget())
     )
     or
     // flow from 'this' parameter into 'this' expressions
-    exists (ThisExpr thiz |
+    exists(ThisExpr thiz |
       pred = TThisNode(thiz.getBindingContainer()) and
-      succ = valueNode(thiz))
+      succ = valueNode(thiz)
+    )
   }
 
   /**
@@ -1064,16 +911,15 @@ module DataFlow {
    * if any.
    */
   private Node defSourceNode(VarDef def, SsaSourceVariable v) {
-    exists (BindingPattern lhs, VarRef r |
-      lhs = def.getTarget() and r = lhs.getABindingVarRef() and r.getVariable() = v |
+    exists(BindingPattern lhs, VarRef r |
+      lhs = def.getTarget() and r = lhs.getABindingVarRef() and r.getVariable() = v
+    |
       // follow one step of the def-use chain if the lhs is a simple variable reference
       lhs = r and
       result = TValueNode(defSourceNode(def))
       or
       // handle destructuring assignments
-      exists (PropertyPattern pp | r = pp.getValuePattern() |
-        result = TPropNode(pp)
-      )
+      exists(PropertyPattern pp | r = pp.getValuePattern() | result = TPropNode(pp))
       or
       result = TElementPatternNode(_, r)
     )
@@ -1092,25 +938,28 @@ module DataFlow {
    * `p.isIncomplete("call")` holds.
    */
   predicate isIncomplete(Node nd, Incompleteness cause) {
-    exists (SsaVariable ssa | nd = TSsaDefNode(ssa.getDefinition()) |
+    exists(SsaVariable ssa | nd = TSsaDefNode(ssa.getDefinition()) |
       defIsIncomplete(ssa.(SsaExplicitDefinition).getDef(), cause)
       or
-      exists (Variable v | v = ssa.getSourceVariable() |
-        v.isNamespaceExport() and cause = "namespace" or
+      exists(Variable v | v = ssa.getSourceVariable() |
+        v.isNamespaceExport() and cause = "namespace"
+        or
         any(DirectEval e).mayAffect(v) and cause = "eval"
       )
     )
     or
-    exists (GlobalVarAccess va |
-      nd = valueNode((VarUse)va) and
+    exists(GlobalVarAccess va |
+      nd = valueNode(va.(VarUse)) and
       cause = "global"
     )
     or
-    exists (Expr e | e = nd.asExpr() and cause = "call" |
+    exists(Expr e | e = nd.asExpr() and cause = "call" |
       e instanceof InvokeExpr and
       not localCall(e, _)
       or
-      e instanceof ThisExpr or e instanceof SuperExpr
+      e instanceof ThisExpr
+      or
+      e instanceof SuperExpr
       or
       e instanceof NewTargetExpr
       or
@@ -1125,7 +974,7 @@ module DataFlow {
     nd.asExpr() instanceof PropAccess and
     cause = "heap"
     or
-    exists (Expr e | e = nd.asExpr() |
+    exists(Expr e | e = nd.asExpr() |
       (e instanceof YieldExpr or e instanceof FunctionSentExpr) and
       cause = "yield"
       or
@@ -1145,16 +994,15 @@ module DataFlow {
     def instanceof ImportSpecifier and
     cause = "import"
     or
-    exists (EnhancedForLoop efl | def = efl.getIteratorExpr()) and
+    exists(EnhancedForLoop efl | def = efl.getIteratorExpr()) and
     cause = "heap"
     or
-    exists (ComprehensionBlock cb | def = cb.getIterator()) and
+    exists(ComprehensionBlock cb | def = cb.getIterator()) and
     cause = "yield"
     or
     def.getTarget() instanceof DestructuringPattern and
     cause = "heap"
   }
-
   import Nodes
   import Sources
   import TypeInference
diff --git a/javascript/ql/src/semmle/javascript/dataflow/InferredTypes.qll b/javascript/ql/src/semmle/javascript/dataflow/InferredTypes.qll
index 6763602eaeda..84d3c7dd5a53 100644
--- a/javascript/ql/src/semmle/javascript/dataflow/InferredTypes.qll
+++ b/javascript/ql/src/semmle/javascript/dataflow/InferredTypes.qll
@@ -12,17 +12,30 @@
  * peculiarities; in particular, their primitive coercion yields
  * a number (not a string, as for most other objects).
  */
-
-newtype TypeTag = TTNull() or TTUndefined() or TTBoolean() or TTNumber() or TTString()
-               or TTFunction() or TTClass() or TTDate() or TTRegExp() or TTObject()
+newtype TypeTag =
+  TTNull() or
+  TTUndefined() or
+  TTBoolean() or
+  TTNumber() or
+  TTString() or
+  TTFunction() or
+  TTClass() or
+  TTDate() or
+  TTRegExp() or
+  TTObject()
 
 /**
  * A `typeof` tag, that is, a possible result of the `typeof` operator.
  */
 class TypeofTag extends string {
   TypeofTag() {
-    this = "undefined" or this = "boolean" or this = "number" or this = "string" or
-    this = "function" or this = "object" or this = "symbol"
+    this = "undefined" or
+    this = "boolean" or
+    this = "number" or
+    this = "string" or
+    this = "function" or
+    this = "object" or
+    this = "symbol"
   }
 }
 
@@ -44,23 +57,34 @@ class InferredType extends TypeTag {
  */
 class PrimitiveType extends InferredType {
   PrimitiveType() {
-    this = TTNull() or this = TTUndefined() or
-    this = TTBoolean() or this = TTNumber() or this = TTString()
+    this = TTNull() or
+    this = TTUndefined() or
+    this = TTBoolean() or
+    this = TTNumber() or
+    this = TTString()
   }
 
   override string getTypeofTag() {
-    this = TTNull() and result = "object" or
-    this = TTUndefined() and result = "undefined" or
-    this = TTBoolean() and result = "boolean" or
-    this = TTNumber() and result = "number" or
+    this = TTNull() and result = "object"
+    or
+    this = TTUndefined() and result = "undefined"
+    or
+    this = TTBoolean() and result = "boolean"
+    or
+    this = TTNumber() and result = "number"
+    or
     this = TTString() and result = "string"
   }
 
   override string toString() {
-    this = TTNull() and result = "null" or
-    this = TTUndefined() and result = "undefined" or
-    this = TTBoolean() and result = "boolean" or
-    this = TTNumber() and result = "number" or
+    this = TTNull() and result = "null"
+    or
+    this = TTUndefined() and result = "undefined"
+    or
+    this = TTBoolean() and result = "boolean"
+    or
+    this = TTNumber() and result = "number"
+    or
     this = TTString() and result = "string"
   }
 }
@@ -71,24 +95,35 @@ class PrimitiveType extends InferredType {
  */
 class NonPrimitiveType extends InferredType {
   NonPrimitiveType() {
-    this = TTFunction() or this = TTClass() or
-    this = TTDate() or this = TTRegExp() or
+    this = TTFunction() or
+    this = TTClass() or
+    this = TTDate() or
+    this = TTRegExp() or
     this = TTObject()
   }
 
   override string getTypeofTag() {
-    this = TTFunction() and result = "function" or
-    this = TTClass() and result = "function" or
-    this = TTDate() and result = "object" or
-    this = TTRegExp() and (result = "object" or result = "function") or
+    this = TTFunction() and result = "function"
+    or
+    this = TTClass() and result = "function"
+    or
+    this = TTDate() and result = "object"
+    or
+    this = TTRegExp() and
+    (result = "object" or result = "function")
+    or
     this = TTObject() and result = "object"
   }
 
   override string toString() {
-    this = TTFunction() and result = "function" or
-    this = TTClass() and result = "class" or
-    this = TTDate() and result = "date" or
-    this = TTRegExp() and result = "regular expression" or
+    this = TTFunction() and result = "function"
+    or
+    this = TTClass() and result = "class"
+    or
+    this = TTDate() and result = "date"
+    or
+    this = TTRegExp() and result = "regular expression"
+    or
     this = TTObject() and result = "object"
   }
 }
@@ -99,6 +134,6 @@ class NonPrimitiveType extends InferredType {
  * Gets a pretty-printed list of all type tags in alphabetical order.
  */
 string ppAllTypeTags() {
-  result = "boolean, class, date, function, null, number, object, regular expression,"
-         + "string or undefined"
-}
\ No newline at end of file
+  result = "boolean, class, date, function, null, number, object, regular expression," +
+      "string or undefined"
+}
diff --git a/javascript/ql/src/semmle/javascript/dataflow/Nodes.qll b/javascript/ql/src/semmle/javascript/dataflow/Nodes.qll
index 1418abf26c52..998c28b11ade 100644
--- a/javascript/ql/src/semmle/javascript/dataflow/Nodes.qll
+++ b/javascript/ql/src/semmle/javascript/dataflow/Nodes.qll
@@ -26,20 +26,13 @@ class InvokeNode extends DataFlow::DefaultSourceNode {
   InvokeNode() { this = impl }
 
   /** Gets the name of the function or method being invoked, if it can be determined. */
-  string getCalleeName() {
-    result = impl.getCalleeName()
-  }
+  string getCalleeName() { result = impl.getCalleeName() }
 
   /** DEPRECATED: Use `getCalleeNode()` instead. */
-  deprecated
-  DataFlow::Node getCallee() {
-    result = getCalleeNode()
-  }
+  deprecated DataFlow::Node getCallee() { result = getCalleeNode() }
 
   /** Gets the data flow node specifying the function to be called. */
-  DataFlow::Node getCalleeNode() {
-    result = impl.getCalleeNode()
-  }
+  DataFlow::Node getCalleeNode() { result = impl.getCalleeNode() }
 
   /**
    * Gets the data flow node corresponding to the `i`th argument of this invocation.
@@ -60,49 +53,36 @@ class InvokeNode extends DataFlow::DefaultSourceNode {
    * but the position of `z` cannot be determined, hence there are no first and second
    * argument nodes.
    */
-  DataFlow::Node getArgument(int i) {
-    result = impl.getArgument(i)
-  }
+  DataFlow::Node getArgument(int i) { result = impl.getArgument(i) }
 
   /** Gets the data flow node corresponding to an argument of this invocation. */
-  DataFlow::Node getAnArgument() {
-    result = impl.getAnArgument()
-  }
+  DataFlow::Node getAnArgument() { result = impl.getAnArgument() }
 
   /** Gets the data flow node corresponding to the last argument of this invocation. */
-  DataFlow::Node getLastArgument() {
-    result = getArgument(getNumArgument()-1)
-  }
+  DataFlow::Node getLastArgument() { result = getArgument(getNumArgument() - 1) }
 
   /** Gets the number of arguments of this invocation, if it can be determined. */
-  int getNumArgument() {
-    result = impl.getNumArgument()
-  }
+  int getNumArgument() { result = impl.getNumArgument() }
 
-  Function getEnclosingFunction() {
-    result = getBasicBlock().getContainer()
-  }
+  Function getEnclosingFunction() { result = getBasicBlock().getContainer() }
 
   /** Gets a function passed as the `i`th argument of this invocation. */
-  FunctionNode getCallback(int i) {
-    result.flowsTo(getArgument(i))
-  }
+  FunctionNode getCallback(int i) { result.flowsTo(getArgument(i)) }
 
   /**
    * Holds if the `i`th argument of this invocation is an object literal whose property
    * `name` is set to `result`.
    */
   DataFlow::ValueNode getOptionArgument(int i, string name) {
-    exists (ObjectLiteralNode obj |
+    exists(ObjectLiteralNode obj |
       obj.flowsTo(getArgument(i)) and
       obj.hasPropertyWrite(name, result)
     )
   }
 
   /** Gets an abstract value representing possible callees of this call site. */
-  cached AbstractValue getACalleeValue() {
-    result = impl.getCalleeNode().analyze().getAValue()
-  }
+  cached
+  AbstractValue getACalleeValue() { result = impl.getCalleeNode().analyze().getAValue() }
 
   /** Gets a potential callee based on dataflow analysis results. */
   private Function getACalleeFromDataflow() {
@@ -121,9 +101,7 @@ class InvokeNode extends DataFlow::DefaultSourceNode {
    * Holds if the approximation of possible callees for this call site is
    * affected by the given analysis incompleteness `cause`.
    */
-  predicate isIndefinite(DataFlow::Incompleteness cause) {
-    getACalleeValue().isIndefinite(cause)
-  }
+  predicate isIndefinite(DataFlow::Incompleteness cause) { getACalleeValue().isIndefinite(cause) }
 
   /**
    * Holds if our approximation of possible callees for this call site is
@@ -138,9 +116,7 @@ class InvokeNode extends DataFlow::DefaultSourceNode {
    */
   predicate isImprecise() {
     isIndefinite("global") and
-    exists (DefiniteAbstractValue v | v = getACalleeValue() |
-      not v instanceof AbstractCallable
-    )
+    exists(DefiniteAbstractValue v | v = getACalleeValue() | not v instanceof AbstractCallable)
   }
 
   /**
@@ -150,16 +126,14 @@ class InvokeNode extends DataFlow::DefaultSourceNode {
   predicate isIncomplete() {
     // the flow analysis identifies a source of incompleteness other than
     // global flow (which usually leads to imprecision rather than incompleteness)
-    any (DataFlow::Incompleteness cause | isIndefinite(cause)) != "global"
+    any(DataFlow::Incompleteness cause | isIndefinite(cause)) != "global"
   }
 
   /**
    * Holds if our approximation of possible callees for this call site is
    * likely to be imprecise or incomplete.
    */
-  predicate isUncertain() {
-    isImprecise() or isIncomplete()
-  }
+  predicate isUncertain() { isImprecise() or isIncomplete() }
 }
 
 /** A data flow node corresponding to a function call without `new`. */
@@ -171,9 +145,7 @@ class CallNode extends InvokeNode {
    *
    * For example, the receiver of `x.m()` is `x`.
    */
-  DataFlow::Node getReceiver() {
-    result = impl.getReceiver()
-  }
+  DataFlow::Node getReceiver() { result = impl.getReceiver() }
 }
 
 /** A data flow node corresponding to a method call. */
@@ -190,44 +162,42 @@ class MethodCallNode extends CallNode {
     receiver = getReceiver() and
     methodName = getMethodName()
   }
-
 }
 
 /** A data flow node corresponding to a `new` expression. */
-class NewNode extends InvokeNode {
-  override DataFlow::Impl::NewNodeDef impl;
-}
+class NewNode extends InvokeNode { override DataFlow::Impl::NewNodeDef impl; }
 
 /** A data flow node corresponding to the `this` parameter in a function or `this` at the top-level. */
 class ThisNode extends DataFlow::Node, DataFlow::DefaultSourceNode {
-  ThisNode() {
-    DataFlow::thisNode(this, _)
-  }
+  ThisNode() { DataFlow::thisNode(this, _) }
 
   /**
    * Gets the function whose `this` binding this expression refers to,
    * which is the nearest enclosing non-arrow function.
    */
   FunctionNode getBinder() {
-    exists (Function binder |
+    exists(Function binder |
       DataFlow::thisNode(this, binder) and
-      result = DataFlow::valueNode(binder))
+      result = DataFlow::valueNode(binder)
+    )
   }
 
   /**
    * Gets the function or top-level whose `this` binding this expression refers to,
    * which is the nearest enclosing non-arrow function or top-level.
    */
-  StmtContainer getBindingContainer() {
-    DataFlow::thisNode(this, result)
-  }
+  StmtContainer getBindingContainer() { DataFlow::thisNode(this, result) }
 
   override string toString() { result = "this" }
 
-  override predicate hasLocationInfo(string filepath, int startline, int startcolumn,
-                                     int endline, int endcolumn) {
+  override predicate hasLocationInfo(
+    string filepath, int startline, int startcolumn, int endline, int endcolumn
+  ) {
     // Use the function entry as the location
-    getBindingContainer().getEntry().getLocation().hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
+    getBindingContainer()
+        .getEntry()
+        .getLocation()
+        .hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
   }
 }
 
@@ -246,14 +216,14 @@ class GlobalVarRefNode extends DataFlow::ValueNode, DataFlow::DefaultSourceNode
  */
 DataFlow::SourceNode globalObjectRef() {
   // top-level `this`
-  exists (ThisNode globalThis | result = globalThis |
-    not exists(globalThis.getBinder())
-  )
+  exists(ThisNode globalThis | result = globalThis | not exists(globalThis.getBinder()))
   or
   // DOM
-  result = globalVarRef("window") or
+  result = globalVarRef("window")
+  or
   // Node.js
-  result = globalVarRef("global") or
+  result = globalVarRef("global")
+  or
   // `require("global")`
   result = moduleImport("global")
 }
@@ -278,47 +248,33 @@ class FunctionNode extends DataFlow::ValueNode, DataFlow::DefaultSourceNode {
   override Function astNode;
 
   /** Gets the `i`th parameter of this function. */
-  ParameterNode getParameter(int i) {
-    result = DataFlow::parameterNode(astNode.getParameter(i))
-  }
+  ParameterNode getParameter(int i) { result = DataFlow::parameterNode(astNode.getParameter(i)) }
 
   /** Gets a parameter of this function. */
-  ParameterNode getAParameter() {
-    result = getParameter(_)
-  }
+  ParameterNode getAParameter() { result = getParameter(_) }
 
   /** Gets the number of parameters declared on this function. */
-  int getNumParameter() {
-    result = count(astNode.getAParameter())
-  }
+  int getNumParameter() { result = count(astNode.getAParameter()) }
 
   /** Holds if the last parameter of this function is a rest parameter. */
-  predicate hasRestParameter() {
-    astNode.hasRestParameter()
-  }
+  predicate hasRestParameter() { astNode.hasRestParameter() }
 
   /** Gets the name of this function, if it has one. */
   string getName() { result = astNode.getName() }
 
   /** Gets a data flow node corresponding to a return value of this function. */
-  DataFlow::Node getAReturn() {
-    result = astNode.getAReturnedExpr().flow()
-  }
+  DataFlow::Node getAReturn() { result = astNode.getAReturnedExpr().flow() }
 
   /**
    * Gets the function this node corresponds to.
    */
-  Function getFunction() {
-    result = astNode
-  }
+  Function getFunction() { result = astNode }
 
   /**
    * Gets the function whose `this` binding a `this` expression in this function refers to,
    * which is the nearest enclosing non-arrow function.
    */
-  FunctionNode getThisBinder() {
-    result.getFunction() = getFunction().getThisBinder()
-  }
+  FunctionNode getThisBinder() { result.getFunction() = getFunction().getThisBinder() }
 
   /**
    * Gets the dataflow node holding the value of the receiver passed to the given function.
@@ -327,9 +283,7 @@ class FunctionNode extends DataFlow::ValueNode, DataFlow::DefaultSourceNode {
    *
    * To get the data flow node for `this` in an arrow function, consider using `getThisBinder().getReceiver()`.
    */
-  ThisNode getReceiver() {
-    result.getBinder() = this
-  }
+  ThisNode getReceiver() { result.getBinder() = this }
 }
 
 /** A data flow node corresponding to an object literal expression. */
@@ -342,22 +296,15 @@ class ArrayLiteralNode extends DataFlow::ValueNode, DataFlow::DefaultSourceNode
   override ArrayExpr astNode;
 
   /** Gets the `i`th element of this array literal. */
-  DataFlow::ValueNode getElement(int i) {
-    result = DataFlow::valueNode(astNode.getElement(i))
-  }
+  DataFlow::ValueNode getElement(int i) { result = DataFlow::valueNode(astNode.getElement(i)) }
 
   /** Gets an element of this array literal. */
-  DataFlow::ValueNode getAnElement() {
-    result = DataFlow::valueNode(astNode.getAnElement())
-  }
-
+  DataFlow::ValueNode getAnElement() { result = DataFlow::valueNode(astNode.getAnElement()) }
 }
 
 /** A data flow node corresponding to a `new Array()` or `Array()` invocation. */
 class ArrayConstructorInvokeNode extends DataFlow::InvokeNode {
-  ArrayConstructorInvokeNode() {
-    getCalleeNode() = DataFlow::globalVarRef("Array")
-  }
+  ArrayConstructorInvokeNode() { getCalleeNode() = DataFlow::globalVarRef("Array") }
 
   /** Gets the `i`th initial element of this array, if one is provided. */
   DataFlow::ValueNode getElement(int i) {
@@ -389,9 +336,7 @@ class ArrayCreationNode extends DataFlow::ValueNode, DataFlow::DefaultSourceNode
   }
 
   /** Gets an initial element of this array, if one if provided. */
-  DataFlow::ValueNode getAnElement() {
-    result = getElement(_)
-  }
+  DataFlow::ValueNode getAnElement() { result = getElement(_) }
 }
 
 /**
@@ -406,21 +351,20 @@ class ModuleImportNode extends DataFlow::DefaultSourceNode {
 
   ModuleImportNode() {
     // `require("http")`
-    exists (Require req | req.getImportedPath().getValue() = path |
-      this = DataFlow::valueNode(req)
-    )
+    exists(Require req | req.getImportedPath().getValue() = path | this = DataFlow::valueNode(req))
     or
     // `import http = require("http")`
-    exists (ExternalModuleReference req | req.getImportedPath().getValue() = path |
+    exists(ExternalModuleReference req | req.getImportedPath().getValue() = path |
       this = DataFlow::valueNode(req)
     )
     or
     // `import * as http from 'http'` or `import http from `http`'
-    exists (ImportDeclaration id, ImportSpecifier is, SsaExplicitDefinition ssa |
+    exists(ImportDeclaration id, ImportSpecifier is, SsaExplicitDefinition ssa |
       id.getImportedPath().getValue() = path and
       is = id.getASpecifier() and
       ssa.getDef() = is and
-      this = DataFlow::ssaDefinitionNode(ssa) |
+      this = DataFlow::ssaDefinitionNode(ssa)
+    |
       is instanceof ImportNamespaceSpecifier and
       count(id.getASpecifier()) = 1
       or
@@ -428,12 +372,12 @@ class ModuleImportNode extends DataFlow::DefaultSourceNode {
     )
     or
     // declared AMD dependency
-    exists (AMDModuleDefinition amd |
+    exists(AMDModuleDefinition amd |
       this = DataFlow::parameterNode(amd.getDependencyParameter(path))
     )
     or
     // AMD require
-    exists (AMDModuleDefinition amd, CallExpr req |
+    exists(AMDModuleDefinition amd, CallExpr req |
       req = amd.getARequireCall() and
       this = DataFlow::valueNode(req) and
       path = req.getArgument(0).(ConstantString).getStringValue()
@@ -441,17 +385,13 @@ class ModuleImportNode extends DataFlow::DefaultSourceNode {
   }
 
   /** Gets the path of the imported module. */
-  string getPath() {
-    result = path
-  }
+  string getPath() { result = path }
 }
 
 /**
  * Gets a (default) import of the module with the given path.
  */
-ModuleImportNode moduleImport(string path) {
-  result.getPath() = path
-}
+ModuleImportNode moduleImport(string path) { result.getPath() = path }
 
 /**
  * Gets a data flow node that either imports `m` from the module with
@@ -461,7 +401,7 @@ ModuleImportNode moduleImport(string path) {
 DataFlow::SourceNode moduleMember(string path, string m) {
   result = moduleImport(path).getAPropertyRead(m)
   or
-  exists (ImportDeclaration id, ImportSpecifier is, SsaExplicitDefinition ssa |
+  exists(ImportDeclaration id, ImportSpecifier is, SsaExplicitDefinition ssa |
     id.getImportedPath().getValue() = path and
     is = id.getASpecifier() and
     is.getImportedName() = m and
diff --git a/javascript/ql/src/semmle/javascript/dataflow/Refinements.qll b/javascript/ql/src/semmle/javascript/dataflow/Refinements.qll
index 30f0965ac7ed..59a827a9e857 100644
--- a/javascript/ql/src/semmle/javascript/dataflow/Refinements.qll
+++ b/javascript/ql/src/semmle/javascript/dataflow/Refinements.qll
@@ -45,7 +45,8 @@ abstract class RefinementCandidate extends Expr {
   /**
    * Gets a refinement value inferred for this expression in context `ctxt`.
    */
-  abstract pragma[nomagic] RefinementValue eval(RefinementContext ctxt);
+  pragma[nomagic]
+  abstract RefinementValue eval(RefinementContext ctxt);
 }
 
 /**
@@ -61,64 +62,46 @@ class Refinement extends Expr {
   /**
    * Gets the variable refined by this expression, if any.
    */
-  SsaSourceVariable getRefinedVar() {
-    result = this.(RefinementCandidate).getARefinedVar()
-  }
+  SsaSourceVariable getRefinedVar() { result = this.(RefinementCandidate).getARefinedVar() }
 
   /**
    * Gets a refinement value inferred for this expression in context `ctxt`.
    */
-  RefinementValue eval(RefinementContext ctxt) {
-    result = this.(RefinementCandidate).eval(ctxt)
-  }
+  RefinementValue eval(RefinementContext ctxt) { result = this.(RefinementCandidate).eval(ctxt) }
 }
 
 /** A literal, viewed as a refinement expression. */
-private abstract class LiteralRefinement extends RefinementCandidate, Literal {
-  override SsaSourceVariable getARefinedVar() {
-    none()
-  }
+abstract private class LiteralRefinement extends RefinementCandidate, Literal {
+  override SsaSourceVariable getARefinedVar() { none() }
 
-  override RefinementValue eval(RefinementContext ctxt) {
-    ctxt.appliesTo(this) and result = eval()
-  }
+  override RefinementValue eval(RefinementContext ctxt) { ctxt.appliesTo(this) and result = eval() }
 
   /**
    * Gets the refinement value that represents this literal.
    */
-  RefinementValue eval() {
-    result = TAny()
-  }
+  RefinementValue eval() { result = TAny() }
 }
 
 /** A `null` literal, viewed as a refinement expression. */
 private class NullLiteralRefinement extends LiteralRefinement, NullLiteral {
-  override RefinementValue eval() {
-    result = TValueWithType(TTNull())
-  }
+  override RefinementValue eval() { result = TValueWithType(TTNull()) }
 }
 
 /** A Boolean literal, viewed as a refinement expression. */
 private class BoolRefinement extends LiteralRefinement, BooleanLiteral {
   override RefinementValue eval() {
-    exists (boolean b | b.toString() = getValue() |
-      result = TBoolConstant(b)
-    )
+    exists(boolean b | b.toString() = getValue() | result = TBoolConstant(b))
   }
 }
 
 /** A constant string, viewed as a refinement expression. */
 private class StringRefinement extends LiteralRefinement, ConstantString {
-  override RefinementValue eval() {
-    result = TStringConstant(getStringValue())
-  }
+  override RefinementValue eval() { result = TStringConstant(getStringValue()) }
 }
 
 /** A numeric literal, viewed as a refinement expression. */
-private abstract class NumberRefinement extends LiteralRefinement, NumberLiteral {
-  override RefinementValue eval() {
-    result = TValueWithType(TTNumber())
-  }
+abstract private class NumberRefinement extends LiteralRefinement, NumberLiteral {
+  override RefinementValue eval() { result = TValueWithType(TTNumber()) }
 }
 
 /**
@@ -130,19 +113,15 @@ private abstract class NumberRefinement extends LiteralRefinement, NumberLiteral
 private class IntRefinement extends NumberRefinement, NumberLiteral {
   IntRefinement() { getValue().toInt() = 0 }
 
-  override RefinementValue eval() {
-    result = TIntConstant(getValue().toInt())
-  }
+  override RefinementValue eval() { result = TIntConstant(getValue().toInt()) }
 }
 
 /**
  * A use of the global variable `undefined`, viewed as a refinement expression.
  */
-private class UndefinedInRefinement extends RefinementCandidate, SyntacticConstants::UndefinedConstant {
-
-  override SsaSourceVariable getARefinedVar() {
-    none()
-  }
+private class UndefinedInRefinement extends RefinementCandidate,
+  SyntacticConstants::UndefinedConstant {
+  override SsaSourceVariable getARefinedVar() { none() }
 
   override RefinementValue eval(RefinementContext ctxt) {
     ctxt.appliesTo(this) and
@@ -152,13 +131,9 @@ private class UndefinedInRefinement extends RefinementCandidate, SyntacticConsta
 
 /** A variable use, viewed as a refinement expression. */
 private class VariableRefinement extends RefinementCandidate, VarUse {
-  VariableRefinement() {
-    getVariable() instanceof SsaSourceVariable
-  }
+  VariableRefinement() { getVariable() instanceof SsaSourceVariable }
 
-  override SsaSourceVariable getARefinedVar() {
-    result = getVariable()
-  }
+  override SsaSourceVariable getARefinedVar() { result = getVariable() }
 
   override RefinementValue eval(RefinementContext ctxt) {
     ctxt.appliesTo(this) and
@@ -168,9 +143,7 @@ private class VariableRefinement extends RefinementCandidate, VarUse {
 
 /** A parenthesized refinement expression. */
 private class ParRefinement extends RefinementCandidate, ParExpr {
-  ParRefinement() {
-    getExpression() instanceof RefinementCandidate
-  }
+  ParRefinement() { getExpression() instanceof RefinementCandidate }
 
   override SsaSourceVariable getARefinedVar() {
     result = getExpression().(RefinementCandidate).getARefinedVar()
@@ -183,16 +156,14 @@ private class ParRefinement extends RefinementCandidate, ParExpr {
 
 /** A `typeof` refinement expression. */
 private class TypeofRefinement extends RefinementCandidate, TypeofExpr {
-  TypeofRefinement() {
-    getOperand() instanceof RefinementCandidate
-  }
+  TypeofRefinement() { getOperand() instanceof RefinementCandidate }
 
   override SsaSourceVariable getARefinedVar() {
     result = getOperand().(RefinementCandidate).getARefinedVar()
   }
 
   override RefinementValue eval(RefinementContext ctxt) {
-    exists (RefinementValue opVal |
+    exists(RefinementValue opVal |
       opVal = getOperand().(RefinementCandidate).eval(ctxt) and
       result = TStringConstant(opVal.typeof())
     )
@@ -212,26 +183,28 @@ private class EqRefinement extends RefinementCandidate, EqualityTest {
   }
 
   override RefinementValue eval(RefinementContext ctxt) {
-    exists (RefinementCandidate l, RefinementValue lv, RefinementCandidate r, RefinementValue rv |
-      l = getLeftOperand() and r = getRightOperand() and
-      lv = l.eval(ctxt) and rv = r.eval(ctxt) |
+    exists(RefinementCandidate l, RefinementValue lv, RefinementCandidate r, RefinementValue rv |
+      l = getLeftOperand() and
+      r = getRightOperand() and
+      lv = l.eval(ctxt) and
+      rv = r.eval(ctxt)
+    |
       // if both sides evaluate to a constant, compare them
-      if lv instanceof SingletonRefinementValue and rv instanceof SingletonRefinementValue then
-        exists (boolean s, boolean p | s = getStrictness() and p = getPolarity()|
-          if lv.(SingletonRefinementValue).equals(rv, s) then
-            result = TBoolConstant(p)
-          else
-            result = TBoolConstant(p.booleanNot())
+      if lv instanceof SingletonRefinementValue and rv instanceof SingletonRefinementValue
+      then
+        exists(boolean s, boolean p | s = getStrictness() and p = getPolarity() |
+          if lv.(SingletonRefinementValue).equals(rv, s)
+          then result = TBoolConstant(p)
+          else result = TBoolConstant(p.booleanNot())
         )
-      // otherwise give up
       else
+        // otherwise give up
         result = TValueWithType(TTBoolean())
     )
   }
 
   private boolean getStrictness() {
-    if this instanceof StrictEqualityTest then result = true
-    else result = false
+    if this instanceof StrictEqualityTest then result = true else result = false
   }
 }
 
@@ -248,14 +221,18 @@ private class IndexRefinement extends RefinementCandidate, IndexExpr {
   }
 
   override RefinementValue eval(RefinementContext ctxt) {
-    exists (RefinementCandidate base, RefinementValue baseVal,
-            RefinementCandidate index, RefinementValue indexVal |
-      base = getBase() and index = getIndex() and
-      baseVal = base.eval(ctxt) and indexVal = index.eval(ctxt) |
-      if exists(evalIndex(baseVal, indexVal)) then
-        result = evalIndex(baseVal, indexVal)
-      else
-        result = TAny()
+    exists(
+      RefinementCandidate base, RefinementValue baseVal, RefinementCandidate index,
+      RefinementValue indexVal
+    |
+      base = getBase() and
+      index = getIndex() and
+      baseVal = base.eval(ctxt) and
+      indexVal = index.eval(ctxt)
+    |
+      if exists(evalIndex(baseVal, indexVal))
+      then result = evalIndex(baseVal, indexVal)
+      else result = TAny()
     )
   }
 }
@@ -264,13 +241,13 @@ private class IndexRefinement extends RefinementCandidate, IndexExpr {
  * Gets the abstract value representing the `i`th character of `s`,
  * if any.
  */
-private bindingset[s, i]
-RefinementValue evalIndex(StringConstant s, IntConstant i) {
+bindingset[s, i]
+private RefinementValue evalIndex(StringConstant s, IntConstant i) {
   result = TStringConstant(s.getValue().charAt(i.getValue()))
 }
 
 /**
-  * A context in which a refinement expression is analyzed.
+ * A context in which a refinement expression is analyzed.
  */
 newtype TRefinementContext =
   /**
@@ -305,8 +282,9 @@ class RefinementContext extends TRefinementContext {
  */
 class VarRefinementContext extends RefinementContext, TVarRefinementContext {
   override predicate appliesTo(RefinementCandidate cand) {
-    exists (AnalyzedRefinement ref, SsaSourceVariable var |
-      this = TVarRefinementContext(ref, var, _) |
+    exists(AnalyzedRefinement ref, SsaSourceVariable var |
+      this = TVarRefinementContext(ref, var, _)
+    |
       cand = ref.getRefinement().getAChildExpr*() and
       not cand.getARefinedVar() != var
     )
@@ -316,51 +294,48 @@ class VarRefinementContext extends RefinementContext, TVarRefinementContext {
    * Gets the abstract refinement value the variable is assumed to have.
    */
   RefinementValue getAValue() {
-    exists (AbstractValue av | this = TVarRefinementContext(_, _, av) |
-      if av instanceof AbstractBoolean then
-        result.(BoolConstant).getValue() = av.(AbstractBoolean).getBooleanValue()
-      else if av instanceof AbstractZero then
-        result.(IntConstant).getValue() = 0
-      else if av instanceof AbstractEmpty then
-        result.(StringConstant).getValue() = ""
-      else if av instanceof AbstractNumString then
-        result instanceof NumString
-      else if av instanceof AbstractOtherString then
-        result instanceof NonEmptyNonNumString
-      else if av instanceof AbstractNonZero then
-        result instanceof NonZeroNumber
+    exists(AbstractValue av | this = TVarRefinementContext(_, _, av) |
+      if av instanceof AbstractBoolean
+      then result.(BoolConstant).getValue() = av.(AbstractBoolean).getBooleanValue()
       else
-        result.(ValueWithType).getType() = av.getType()
+        if av instanceof AbstractZero
+        then result.(IntConstant).getValue() = 0
+        else
+          if av instanceof AbstractEmpty
+          then result.(StringConstant).getValue() = ""
+          else
+            if av instanceof AbstractNumString
+            then result instanceof NumString
+            else
+              if av instanceof AbstractOtherString
+              then result instanceof NonEmptyNonNumString
+              else
+                if av instanceof AbstractNonZero
+                then result instanceof NonZeroNumber
+                else result.(ValueWithType).getType() = av.getType()
     )
   }
 
   override string toString() {
-    exists (Variable var, AbstractValue val | this = TVarRefinementContext(_, var, val) |
+    exists(Variable var, AbstractValue val | this = TVarRefinementContext(_, var, val) |
       result = "[" + var + " = " + val + "]"
     )
   }
 }
 
 /** Holds if `e` is nested inside a guard node. */
-private predicate inGuard(Expr e) {
-  e.getParentExpr*() = any(GuardControlFlowNode g).getTest()
-}
+private predicate inGuard(Expr e) { e.getParentExpr*() = any(GuardControlFlowNode g).getTest() }
 
 /**
  * An abstract value of a refinement expression.
  */
 private newtype TRefinementValue =
   /** An abstract value indicating that no refinement information is available. */
-  TAny()
-  or
+  TAny() or
   /** An abstract value representing all concrete values of type `tp`. */
-  TValueWithType(InferredType tp)
-  or
+  TValueWithType(InferredType tp) or
   /** An abstract value representing the Boolean value `b`. */
-  TBoolConstant(boolean b) {
-    b = true or b = false
-  }
-  or
+  TBoolConstant(boolean b) { b = true or b = false } or
   /**
    * An abstract value representing the string `s`.
    *
@@ -376,8 +351,7 @@ private newtype TRefinementValue =
     s = any(StringRefinement sr | inGuard(sr)).getValue()
     or
     s = any(TypeofTag t).charAt(_)
-  }
-  or
+  } or
   /**
    * An abstract value representing the integer `i`.
    *
@@ -387,19 +361,16 @@ private newtype TRefinementValue =
   TIntConstant(int i) {
     i = 0 or
     i = any(IntRefinement ir | inGuard(ir)).getValue().toInt()
-  }
-  or
+  } or
   /**
    * An abstract value representing a non-empty string that coerces to a number
    * (and not `NaN`).
    */
-  TNumString()
-  or
+  TNumString() or
   /**
    * An abstract value representing a string `s` such that `Number(s)` is `NaN`.
    */
-  TNonEmptyNonNumString()
-  or
+  TNonEmptyNonNumString() or
   /**
    * An abstract value representing a non-zero number.
    */
@@ -455,7 +426,8 @@ private class ValueWithType extends RefinementValue, TValueWithType {
   override string typeof() { result = getType().getTypeofTag() }
 
   override boolean getABooleanValue() {
-    result = true or
+    result = true
+    or
     // only primitive types can be falsy
     getType() instanceof PrimitiveType and result = false
   }
@@ -468,7 +440,8 @@ private class NullOrUndefined extends ValueWithType, SingletonRefinementValue {
   override boolean getABooleanValue() { result = false }
 
   override predicate equals(SingletonRefinementValue that, boolean isStrict) {
-    SingletonRefinementValue.super.equals(that, isStrict) or
+    SingletonRefinementValue.super.equals(that, isStrict)
+    or
     isStrict = false and that instanceof NullOrUndefined
   }
 }
@@ -489,11 +462,15 @@ private class BoolConstant extends SingletonRefinementValue, TBoolConstant {
   override boolean getABooleanValue() { result = value }
 
   override predicate equals(SingletonRefinementValue that, boolean isStrict) {
-    SingletonRefinementValue.super.equals(that, isStrict) or
-    isStrict = false and (
-      value = false and (that.(StringConstant).isEmptyOrZero() or that = TIntConstant(0))
+    SingletonRefinementValue.super.equals(that, isStrict)
+    or
+    isStrict = false and
+    (
+      value = false and
+      (that.(StringConstant).isEmptyOrZero() or that = TIntConstant(0))
       or
-      value = true and (that = TStringConstant("1") or that = TIntConstant(1))
+      value = true and
+      (that = TStringConstant("1") or that = TIntConstant(1))
     )
   }
 }
@@ -508,24 +485,19 @@ private class StringConstant extends SingletonRefinementValue, TStringConstant {
   string getValue() { this = TStringConstant(result) }
 
   /** Holds if this is the empty string or the string `"0"`. */
-  predicate isEmptyOrZero() {
-    value = "" or value = "0"
-  }
+  predicate isEmptyOrZero() { value = "" or value = "0" }
 
   override string toString() { result = "'" + value + "'" }
 
   override string typeof() { result = "string" }
 
-  override boolean getABooleanValue() {
-    if value = "" then
-      result = false
-    else
-      result = true
-  }
+  override boolean getABooleanValue() { if value = "" then result = false else result = true }
 
   override predicate equals(SingletonRefinementValue that, boolean isStrict) {
-    SingletonRefinementValue.super.equals(that, isStrict) or
-    isStrict = false and (
+    SingletonRefinementValue.super.equals(that, isStrict)
+    or
+    isStrict = false and
+    (
       isEmptyOrZero() and that = TBoolConstant(false)
       or
       value = "1" and that = TBoolConstant(true)
@@ -548,16 +520,13 @@ private class IntConstant extends SingletonRefinementValue, TIntConstant {
 
   override string typeof() { result = "number" }
 
-  override boolean getABooleanValue() {
-    if value = 0 then
-      result = false
-    else
-      result = true
-  }
+  override boolean getABooleanValue() { if value = 0 then result = false else result = true }
 
   override predicate equals(SingletonRefinementValue that, boolean isStrict) {
-    SingletonRefinementValue.super.equals(that, isStrict) or
-    isStrict = false and (
+    SingletonRefinementValue.super.equals(that, isStrict)
+    or
+    isStrict = false and
+    (
       value = 0 and that = TBoolConstant(false)
       or
       value = 1 and that = TBoolConstant(true)
@@ -573,7 +542,9 @@ private class IntConstant extends SingletonRefinementValue, TIntConstant {
  */
 private class NumString extends RefinementValue, TNumString {
   override string toString() { result = "numeric string" }
+
   override string typeof() { result = "string" }
+
   override boolean getABooleanValue() { result = true }
 }
 
@@ -583,7 +554,9 @@ private class NumString extends RefinementValue, TNumString {
  */
 private class NonEmptyNonNumString extends RefinementValue, TNonEmptyNonNumString {
   override string toString() { result = "non-empty, non-numeric string" }
+
   override string typeof() { result = "string" }
+
   override boolean getABooleanValue() { result = true }
 }
 
@@ -592,6 +565,8 @@ private class NonEmptyNonNumString extends RefinementValue, TNonEmptyNonNumStrin
  */
 private class NonZeroNumber extends RefinementValue, TNonZeroNumber {
   override string toString() { result = "non-zero number" }
+
   override string typeof() { result = "number" }
+
   override boolean getABooleanValue() { result = true }
 }
diff --git a/javascript/ql/src/semmle/javascript/dataflow/Sources.qll b/javascript/ql/src/semmle/javascript/dataflow/Sources.qll
index e56e60aa98a2..aaca401dc684 100644
--- a/javascript/ql/src/semmle/javascript/dataflow/Sources.qll
+++ b/javascript/ql/src/semmle/javascript/dataflow/Sources.qll
@@ -32,9 +32,7 @@ abstract class SourceNode extends DataFlow::Node {
    * Holds if this node flows into `sink` in zero or more local (that is,
    * intra-procedural) steps.
    */
-  predicate flowsToExpr(Expr sink) {
-    flowsTo(DataFlow::valueNode(sink))
-  }
+  predicate flowsToExpr(Expr sink) { flowsTo(DataFlow::valueNode(sink)) }
 
   /**
    * Gets a reference (read or write) of property `propName` on this node.
@@ -47,9 +45,7 @@ abstract class SourceNode extends DataFlow::Node {
   /**
    * Gets a read of property `propName` on this node.
    */
-  DataFlow::PropRead getAPropertyRead(string propName) {
-    result = getAPropertyReference(propName)
-  }
+  DataFlow::PropRead getAPropertyRead(string propName) { result = getAPropertyReference(propName) }
 
   /**
    * Gets a write of property `propName` on this node.
@@ -81,23 +77,17 @@ abstract class SourceNode extends DataFlow::Node {
   /**
    * Gets a reference (read or write) of any property on this node.
    */
-  DataFlow::PropRef getAPropertyReference() {
-    flowsTo(result.getBase())
-  }
+  DataFlow::PropRef getAPropertyReference() { flowsTo(result.getBase()) }
 
   /**
    * Gets a read of any property on this node.
    */
-  DataFlow::PropRead getAPropertyRead() {
-    result = getAPropertyReference()
-  }
+  DataFlow::PropRead getAPropertyRead() { result = getAPropertyReference() }
 
   /**
    * Gets a write of any property on this node.
    */
-  DataFlow::PropWrite getAPropertyWrite() {
-    result = getAPropertyReference()
-  }
+  DataFlow::PropWrite getAPropertyWrite() { result = getAPropertyReference() }
 
   /**
    * Gets an invocation of the method or constructor named `memberName` on this node.
@@ -113,9 +103,7 @@ abstract class SourceNode extends DataFlow::Node {
    * (as in `o.m(...)`), and calls where the callee undergoes some additional
    * data flow (as in `tmp = o.m; tmp(...)`).
    */
-  DataFlow::CallNode getAMemberCall(string memberName) {
-    result = getAMemberInvocation(memberName)
-  }
+  DataFlow::CallNode getAMemberCall(string memberName) { result = getAMemberInvocation(memberName) }
 
   /**
    * Gets a method call that invokes method `methodName` on this node.
@@ -124,7 +112,7 @@ abstract class SourceNode extends DataFlow::Node {
    * that is, `o.m(...)` or `o[p](...)`.
    */
   DataFlow::CallNode getAMethodCall(string methodName) {
-    exists (PropAccess pacc |
+    exists(PropAccess pacc |
       pacc = result.getCalleeNode().asExpr().getUnderlyingReference() and
       flowsToExpr(pacc.getBase()) and
       pacc.getPropertyName() = methodName
@@ -137,9 +125,7 @@ abstract class SourceNode extends DataFlow::Node {
    * This includes only calls that have the syntactic shape of a method call,
    * that is, `o.m(...)` or `o[p](...)`.
    */
-  DataFlow::CallNode getAMethodCall() {
-    result = getAMethodCall(_)
-  }
+  DataFlow::CallNode getAMethodCall() { result = getAMethodCall(_) }
 
   /**
    * Gets a chained method call that invokes `methodName` last.
@@ -161,23 +147,17 @@ abstract class SourceNode extends DataFlow::Node {
   /**
    * Gets an invocation (with our without `new`) of this node.
    */
-  DataFlow::InvokeNode getAnInvocation() {
-    flowsTo(result.getCalleeNode())
-  }
+  DataFlow::InvokeNode getAnInvocation() { flowsTo(result.getCalleeNode()) }
 
   /**
    * Gets a function call to this node.
    */
-  DataFlow::CallNode getACall() {
-    result = getAnInvocation()
-  }
+  DataFlow::CallNode getACall() { result = getAnInvocation() }
 
   /**
    * Gets a `new` call to this node.
    */
-  DataFlow::NewNode getAnInstantiation() {
-    result = getAnInvocation()
-  }
+  DataFlow::NewNode getAnInstantiation() { result = getAnInvocation() }
 
   /**
    * Gets a source node whose value is stored in property `prop` of this node.
@@ -205,7 +185,7 @@ abstract class SourceNode extends DataFlow::Node {
  */
 class DefaultSourceNode extends SourceNode {
   DefaultSourceNode() {
-    exists (ASTNode astNode | this = DataFlow::valueNode(astNode) |
+    exists(ASTNode astNode | this = DataFlow::valueNode(astNode) |
       astNode instanceof PropAccess or
       astNode instanceof Function or
       astNode instanceof ClassDefinition or
@@ -216,8 +196,9 @@ class DefaultSourceNode extends SourceNode {
       astNode instanceof ExternalModuleReference
     )
     or
-    exists (SsaExplicitDefinition ssa, VarDef def |
-      this = DataFlow::ssaDefinitionNode(ssa) and def = ssa.getDef() |
+    exists(SsaExplicitDefinition ssa, VarDef def |
+      this = DataFlow::ssaDefinitionNode(ssa) and def = ssa.getDef()
+    |
       def instanceof ImportSpecifier
     )
     or
diff --git a/javascript/ql/src/semmle/javascript/dataflow/TaintTracking.qll b/javascript/ql/src/semmle/javascript/dataflow/TaintTracking.qll
index a00d4f64077d..ae6c696bc483 100644
--- a/javascript/ql/src/semmle/javascript/dataflow/TaintTracking.qll
+++ b/javascript/ql/src/semmle/javascript/dataflow/TaintTracking.qll
@@ -39,9 +39,7 @@ module TaintTracking {
      * The smaller this predicate is, the faster `hasFlow()` will converge.
      */
     // overridden to provide taint-tracking specific qldoc
-    override predicate isSource(DataFlow::Node source) {
-      super.isSource(source)
-    }
+    override predicate isSource(DataFlow::Node source) { super.isSource(source) }
 
     /**
      * Holds if `sink` is a relevant taint sink.
@@ -49,19 +47,13 @@ module TaintTracking {
      * The smaller this predicate is, the faster `hasFlow()` will converge.
      */
     // overridden to provide taint-tracking specific qldoc
-    override predicate isSink(DataFlow::Node sink) {
-      super.isSink(sink)
-    }
+    override predicate isSink(DataFlow::Node sink) { super.isSink(sink) }
 
     /** Holds if the intermediate node `node` is a taint sanitizer. */
-    predicate isSanitizer(DataFlow::Node node) {
-      none()
-    }
+    predicate isSanitizer(DataFlow::Node node) { none() }
 
     /** Holds if the edge from `source` to `sink` is a taint sanitizer. */
-    predicate isSanitizer(DataFlow::Node source, DataFlow::Node sink) {
-      none()
-    }
+    predicate isSanitizer(DataFlow::Node source, DataFlow::Node sink) { none() }
 
     /** Holds if the edge from `source` to `sink` is a taint sanitizer for data labelled with `lbl`. */
     predicate isSanitizer(DataFlow::Node source, DataFlow::Node sink, DataFlow::FlowLabel lbl) {
@@ -76,30 +68,26 @@ module TaintTracking {
      * `if(x == 'some-constant'){ ... x ... }`, it could sanitize flow of
      * `x` into the "then" branch.
      */
-    predicate isSanitizerGuard(SanitizerGuardNode guard) {
-      none()
-    }
+    predicate isSanitizerGuard(SanitizerGuardNode guard) { none() }
 
-    final
-    override predicate isBarrier(DataFlow::Node node) {
+    final override predicate isBarrier(DataFlow::Node node) {
       super.isBarrier(node) or
       isSanitizer(node)
     }
 
-    final
-    override predicate isBarrier(DataFlow::Node source, DataFlow::Node sink) {
+    final override predicate isBarrier(DataFlow::Node source, DataFlow::Node sink) {
       super.isBarrier(source, sink) or
       isSanitizer(source, sink)
     }
 
-    final
-    override predicate isBarrier(DataFlow::Node source, DataFlow::Node sink, DataFlow::FlowLabel lbl) {
+    final override predicate isBarrier(
+      DataFlow::Node source, DataFlow::Node sink, DataFlow::FlowLabel lbl
+    ) {
       super.isBarrier(source, sink, lbl) or
       isSanitizer(source, sink, lbl)
     }
 
-    final
-    override predicate isBarrierGuard(DataFlow::BarrierGuardNode guard) {
+    final override predicate isBarrierGuard(DataFlow::BarrierGuardNode guard) {
       super.isBarrierGuard(guard) or
       guard.(AdditionalSanitizerGuardNode).appliesTo(this) or
       isSanitizerGuard(guard)
@@ -109,19 +97,17 @@ module TaintTracking {
      * Holds if the additional taint propagation step from `pred` to `succ`
      * must be taken into account in the analysis.
      */
-    predicate isAdditionalTaintStep(DataFlow::Node pred, DataFlow::Node succ) {
-      none()
-    }
+    predicate isAdditionalTaintStep(DataFlow::Node pred, DataFlow::Node succ) { none() }
 
-    final
-    override predicate isAdditionalFlowStep(DataFlow::Node pred, DataFlow::Node succ) {
+    final override predicate isAdditionalFlowStep(DataFlow::Node pred, DataFlow::Node succ) {
       isAdditionalTaintStep(pred, succ) or
       pred = succ.(FlowTarget).getATaintSource() or
       any(AdditionalTaintStep dts).step(pred, succ)
     }
 
-    final
-    override predicate isAdditionalFlowStep(DataFlow::Node pred, DataFlow::Node succ, boolean valuePreserving) {
+    final override predicate isAdditionalFlowStep(
+      DataFlow::Node pred, DataFlow::Node succ, boolean valuePreserving
+    ) {
       isAdditionalFlowStep(pred, succ) and valuePreserving = false
     }
   }
@@ -135,36 +121,30 @@ module TaintTracking {
    * for analysis-specific taint steps.
    */
   abstract class AdditionalSanitizerGuardNode extends SanitizerGuardNode {
-
     /**
      * Holds if this guard applies to the flow in `cfg`.
      */
     abstract predicate appliesTo(Configuration cfg);
-
   }
 
   /**
    * A node that can act as a sanitizer when appearing in a condition.
    */
   abstract class SanitizerGuardNode extends DataFlow::BarrierGuardNode {
-
-    final override predicate blocks(boolean outcome, Expr e) {
-      sanitizes(outcome, e)
-    }
+    final override predicate blocks(boolean outcome, Expr e) { sanitizes(outcome, e) }
 
     /**
      * Holds if this node sanitizes expression `e`, provided it evaluates
      * to `outcome`.
      */
     abstract predicate sanitizes(boolean outcome, Expr e);
-
   }
 
   /**
    * A sanitizer guard node that only blocks specific flow labels.
    */
-  abstract class LabeledSanitizerGuardNode extends SanitizerGuardNode, DataFlow::LabeledBarrierGuardNode {
-  }
+  abstract class LabeledSanitizerGuardNode extends SanitizerGuardNode,
+    DataFlow::LabeledBarrierGuardNode { }
 
   /**
    * DEPRECATED: Override `Configuration::isAdditionalTaintStep` or use
@@ -183,12 +163,14 @@ module TaintTracking {
    * of the standard library. Override `Configuration::isAdditionalTaintStep`
    * for analysis-specific taint steps.
    */
-  abstract cached class AdditionalTaintStep extends DataFlow::Node {
+  cached
+  abstract class AdditionalTaintStep extends DataFlow::Node {
     /**
      * Holds if `pred` &rarr; `succ` should be considered a taint-propagating
      * data flow edge.
      */
-    abstract cached predicate step(DataFlow::Node pred, DataFlow::Node succ);
+    cached
+    abstract predicate step(DataFlow::Node pred, DataFlow::Node succ);
   }
 
   /** DEPRECATED: Use `AdditionalTaintStep` instead. */
@@ -207,10 +189,11 @@ module TaintTracking {
 
     override predicate step(DataFlow::Node pred, DataFlow::Node succ) {
       succ = this and
-      exists (Expr e, Expr f | e = this.asExpr() and f = pred.asExpr() |
+      exists(Expr e, Expr f | e = this.asExpr() and f = pred.asExpr() |
         // arrays with tainted elements and objects with tainted property names are tainted
-        e.(ArrayExpr).getAnElement() = f or
-        exists (Property prop | e.(ObjectExpr).getAProperty() = prop |
+        e.(ArrayExpr).getAnElement() = f
+        or
+        exists(Property prop | e.(ObjectExpr).getAProperty() = prop |
           prop.isComputed() and f = prop.getNameExpr()
         )
         or
@@ -223,7 +206,7 @@ module TaintTracking {
       succ.(DataFlow::PropRead).getBase() = pred
       or
       // iterating over a tainted iterator taints the loop variable
-      exists (EnhancedForLoop efl, SsaExplicitDefinition ssa |
+      exists(EnhancedForLoop efl, SsaExplicitDefinition ssa |
         this = DataFlow::valueNode(efl.getIterationDomain()) and
         pred = this and
         ssa.getDef() = efl.getIteratorExpr() and
@@ -236,18 +219,14 @@ module TaintTracking {
    * A taint propagating data flow edge through persistent storage.
    */
   private class StorageTaintStep extends AdditionalTaintStep {
-
     PersistentReadAccess read;
 
-    StorageTaintStep() {
-      this = read
-    }
+    StorageTaintStep() { this = read }
 
     override predicate step(DataFlow::Node pred, DataFlow::Node succ) {
-        pred = read.getAWrite().getValue() and
-        succ = read
+      pred = read.getAWrite().getValue() and
+      succ = read
     }
-
   }
 
   /**
@@ -256,14 +235,12 @@ module TaintTracking {
   private class ArrayFunctionTaintStep extends AdditionalTaintStep {
     DataFlow::CallNode call;
 
-    ArrayFunctionTaintStep() {
-      this = call
-    }
+    ArrayFunctionTaintStep() { this = call }
 
     override predicate step(DataFlow::Node pred, DataFlow::Node succ) {
       // `array.map(function (elt, i, ary) { ... })`: if `array` is tainted, then so are
       // `elt` and `ary`; similar for `forEach`
-      exists (string name, Function f, int i |
+      exists(string name, Function f, int i |
         (name = "map" or name = "forEach") and
         (i = 0 or i = 2) and
         call.getArgument(0).analyze().getAValue().(AbstractFunction).getFunction() = f and
@@ -272,7 +249,7 @@ module TaintTracking {
       )
       or
       // `array.map` with tainted return value in callback
-      exists (DataFlow::FunctionNode f |
+      exists(DataFlow::FunctionNode f |
         call.(DataFlow::MethodCallNode).getMethodName() = "map" and
         call.getArgument(0) = f and // Require the argument to be a closure to avoid spurious call/return flow
         pred = f.getAReturn() and
@@ -280,19 +257,21 @@ module TaintTracking {
       )
       or
       // `array.push(e)`, `array.unshift(e)`: if `e` is tainted, then so is `array`.
-      exists (string name |
+      exists(string name |
         name = "push" or
-        name = "unshift" |
+        name = "unshift"
+      |
         pred = call.getAnArgument() and
         succ.(DataFlow::SourceNode).getAMethodCall(name) = call
       )
       or
       // `e = array.pop()`, `e = array.shift()`, or similar: if `array` is tainted, then so is `e`.
-      exists (string name |
+      exists(string name |
         name = "pop" or
         name = "shift" or
         name = "slice" or
-        name = "splice" |
+        name = "splice"
+      |
         call.(DataFlow::MethodCallNode).calls(pred, name) and
         succ = call
       )
@@ -302,7 +281,6 @@ module TaintTracking {
       pred = call.getAnArgument() and
       succ = call
     }
-
   }
 
   /**
@@ -317,10 +295,11 @@ module TaintTracking {
    */
   private class DictionaryTaintStep extends AdditionalTaintStep, DataFlow::ValueNode {
     override VarAccess astNode;
+
     DataFlow::Node source;
 
     DictionaryTaintStep() {
-      exists (AssignExpr assgn, IndexExpr idx, AbstractObjectLiteral obj |
+      exists(AssignExpr assgn, IndexExpr idx, AbstractObjectLiteral obj |
         assgn.getTarget() = idx and
         idx.getBase().analyze().getAValue() = obj and
         not exists(idx.getPropertyName()) and
@@ -341,18 +320,19 @@ module TaintTracking {
    * also is an instance of `C`.
    */
   private class ReactComponentStateTaintStep extends AdditionalTaintStep, DataFlow::ValueNode {
-
     DataFlow::Node source;
 
     ReactComponentStateTaintStep() {
-      exists (ReactComponent c, DataFlow::PropRead prn, DataFlow::PropWrite pwn |
+      exists(ReactComponent c, DataFlow::PropRead prn, DataFlow::PropWrite pwn |
         (
           c.getACandidateStateSource().flowsTo(pwn.getBase()) or
           c.getADirectStateAccess().flowsTo(pwn.getBase())
-        ) and (
+        ) and
+        (
           c.getAPreviousStateSource().flowsTo(prn.getBase()) or
           c.getADirectStateAccess().flowsTo(prn.getBase())
-        ) |
+        )
+      |
         prn.getPropertyName() = pwn.getPropertyName() and
         this = prn and
         source = pwn.getRhs()
@@ -362,7 +342,6 @@ module TaintTracking {
     override predicate step(DataFlow::Node pred, DataFlow::Node succ) {
       pred = source and succ = this
     }
-
   }
 
   /**
@@ -372,13 +351,13 @@ module TaintTracking {
    * also is an instance of `C`.
    */
   private class ReactComponentPropsTaintStep extends AdditionalTaintStep, DataFlow::ValueNode {
-
     DataFlow::Node source;
 
     ReactComponentPropsTaintStep() {
-      exists (ReactComponent c, string name, DataFlow::PropRead prn |
+      exists(ReactComponent c, string name, DataFlow::PropRead prn |
         prn = c.getAPropRead(name) or
-        prn = c.getAPreviousPropsSource().getAPropertyRead(name) |
+        prn = c.getAPreviousPropsSource().getAPropertyRead(name)
+      |
         source = c.getACandidatePropsValue(name) and
         this = prn
       )
@@ -387,7 +366,6 @@ module TaintTracking {
     override predicate step(DataFlow::Node pred, DataFlow::Node succ) {
       pred = source and succ = this
     }
-
   }
 
   /**
@@ -398,13 +376,13 @@ module TaintTracking {
    */
   class StringConcatenationTaintStep extends AdditionalTaintStep, DataFlow::ValueNode {
     override predicate step(DataFlow::Node pred, DataFlow::Node succ) {
-        succ = this and
-        StringConcatenation::taintStep(pred, succ)
+      succ = this and
+      StringConcatenation::taintStep(pred, succ)
     }
   }
-  
+
   /**
-   * A taint propagating data flow edge arising from string manipulation 
+   * A taint propagating data flow edge arising from string manipulation
    * functions defined in the standard library.
    */
   private class StringManipulationTaintStep extends AdditionalTaintStep, DataFlow::ValueNode {
@@ -412,9 +390,10 @@ module TaintTracking {
       succ = this and
       (
         // string operations that propagate taint
-        exists (string name | name = astNode.(MethodCallExpr).getMethodName() |
+        exists(string name | name = astNode.(MethodCallExpr).getMethodName() |
           pred.asExpr() = astNode.(MethodCallExpr).getReceiver() and
-          ( // sorted, interesting, properties of String.prototype
+          (
+            // sorted, interesting, properties of String.prototype
             name = "anchor" or
             name = "big" or
             name = "blink" or
@@ -449,34 +428,39 @@ module TaintTracking {
             name = "valueOf" or
             // sorted, interesting, properties of Array.prototype
             name = "join"
-          ) or
-          exists (int i | pred.asExpr() = astNode.(MethodCallExpr).getArgument(i) |
-            name = "concat" or
+          )
+          or
+          exists(int i | pred.asExpr() = astNode.(MethodCallExpr).getArgument(i) |
+            name = "concat"
+            or
             name = "replace" and i = 1
           )
         )
         or
         // standard library constructors that propagate taint: `RegExp` and `String`
-        exists (DataFlow::InvokeNode invk, string gv |
-          gv = "RegExp" or gv = "String" |
+        exists(DataFlow::InvokeNode invk, string gv | gv = "RegExp" or gv = "String" |
           this = invk and
           invk = DataFlow::globalVarRef(gv).getAnInvocation() and
           pred = invk.getArgument(0)
         )
         or
         // String.fromCharCode and String.fromCodePoint
-        exists (int i, MethodCallExpr mce |
+        exists(int i, MethodCallExpr mce |
           mce = astNode and
           pred.asExpr() = mce.getArgument(i) and
           (mce.getMethodName() = "fromCharCode" or mce.getMethodName() = "fromCodePoint")
         )
         or
         // `(encode|decode)URI(Component)?` and `escape` propagate taint
-        exists (DataFlow::CallNode c, string name |
-          this = c and c = DataFlow::globalVarRef(name).getACall() and
-          pred = c.getArgument(0) |
-          name = "encodeURI" or name = "decodeURI" or
-          name = "encodeURIComponent" or name = "decodeURIComponent"
+        exists(DataFlow::CallNode c, string name |
+          this = c and
+          c = DataFlow::globalVarRef(name).getACall() and
+          pred = c.getArgument(0)
+        |
+          name = "encodeURI" or
+          name = "decodeURI" or
+          name = "encodeURIComponent" or
+          name = "decodeURIComponent"
         )
       )
     }
@@ -486,16 +470,16 @@ module TaintTracking {
    * A taint propagating data flow edge arising from string formatting.
    */
   private class StringFormattingTaintStep extends AdditionalTaintStep {
-    
     PrintfStyleCall call;
-    
+
     StringFormattingTaintStep() {
       this = call and
       call.returnsFormatted()
     }
-    
+
     override predicate step(DataFlow::Node pred, DataFlow::Node succ) {
-      succ = this and (
+      succ = this and
+      (
         pred = call.getFormatString()
         or
         pred = call.getFormatArgument(_)
@@ -507,9 +491,7 @@ module TaintTracking {
    * A taint propagating data flow edge arising from JSON unparsing.
    */
   private class JsonStringifyTaintStep extends AdditionalTaintStep, DataFlow::MethodCallNode {
-    JsonStringifyTaintStep() {
-      this = DataFlow::globalVarRef("JSON").getAMemberCall("stringify")
-    }
+    JsonStringifyTaintStep() { this = DataFlow::globalVarRef("JSON").getAMemberCall("stringify") }
 
     override predicate step(DataFlow::Node pred, DataFlow::Node succ) {
       pred = getArgument(0) and succ = this
@@ -535,14 +517,14 @@ module TaintTracking {
    * the parameters encoded in `input`.
    */
   predicate isUrlSearchParams(DataFlow::SourceNode params, DataFlow::Node input) {
-    exists (DataFlow::GlobalVarRefNode urlSearchParams, NewExpr newUrlSearchParams |
+    exists(DataFlow::GlobalVarRefNode urlSearchParams, NewExpr newUrlSearchParams |
       urlSearchParams.getName() = "URLSearchParams" and
       newUrlSearchParams = urlSearchParams.getAnInstantiation().asExpr() and
       params.asExpr() = newUrlSearchParams and
       input.asExpr() = newUrlSearchParams.getArgument(0)
     )
     or
-    exists (DataFlow::NewNode newUrl |
+    exists(DataFlow::NewNode newUrl |
       newUrl = DataFlow::globalVarRef("URL").getAnInstantiation() and
       params = newUrl.getAPropertyRead("searchParams") and
       input = newUrl.getArgument(0)
@@ -560,7 +542,7 @@ module TaintTracking {
       isUrlSearchParams(this, source)
       or
       // or this is a call to `get` or `getAll` on a `URLSearchParams` object
-      exists (DataFlow::SourceNode searchParams, string m |
+      exists(DataFlow::SourceNode searchParams, string m |
         isUrlSearchParams(searchParams, source) and
         this = searchParams.getAMethodCall(m) and
         m.matches("get%")
@@ -576,9 +558,7 @@ module TaintTracking {
    * A taint propagating data flow edge arising from sorting.
    */
   private class SortTaintStep extends AdditionalTaintStep, DataFlow::MethodCallNode {
-    SortTaintStep() {
-      getMethodName() = "sort"
-    }
+    SortTaintStep() { getMethodName() = "sort" }
 
     override predicate step(DataFlow::Node pred, DataFlow::Node succ) {
       pred = getReceiver() and succ = this
@@ -593,8 +573,9 @@ module TaintTracking {
     Expr expr;
 
     SanitizingRegExpTest() {
-      exists (MethodCallExpr mce, Expr base, string m, Expr firstArg |
-        mce = astNode and mce.calls(base, m) and firstArg = mce.getArgument(0) |
+      exists(MethodCallExpr mce, Expr base, string m, Expr firstArg |
+        mce = astNode and mce.calls(base, m) and firstArg = mce.getArgument(0)
+      |
         // /re/.test(u) or /re/.exec(u)
         base.analyze().getAType() = TTRegExp() and
         (m = "test" or m = "exec") and
@@ -603,28 +584,24 @@ module TaintTracking {
         // u.match(/re/) or u.match("re")
         base = expr and
         m = "match" and
-        exists (InferredType firstArgType | firstArgType = firstArg.analyze().getAType() |
+        exists(InferredType firstArgType | firstArgType = firstArg.analyze().getAType() |
           firstArgType = TTRegExp() or firstArgType = TTString()
         )
       )
       or
       // m = /re/.exec(u) and similar
-      DataFlow::valueNode(astNode.(AssignExpr).getRhs()).(SanitizingRegExpTest).getSanitizedExpr() = expr
+      DataFlow::valueNode(astNode.(AssignExpr).getRhs()).(SanitizingRegExpTest).getSanitizedExpr() =
+        expr
     }
 
-    private Expr getSanitizedExpr() {
-      result = expr
-    }
+    private Expr getSanitizedExpr() { result = expr }
 
     override predicate sanitizes(boolean outcome, Expr e) {
       (outcome = true or outcome = false) and
       e = expr
     }
 
-    override predicate appliesTo(Configuration cfg) {
-      any()
-    }
-
+    override predicate appliesTo(Configuration cfg) { any() }
   }
 
   /**
@@ -632,13 +609,15 @@ module TaintTracking {
    *
    * `<contains>` is one of: `contains`, `has`, `hasOwnProperty`, `includes`
    */
-  class WhitelistContainmentCallSanitizer extends AdditionalSanitizerGuardNode, DataFlow::MethodCallNode {
+  class WhitelistContainmentCallSanitizer extends AdditionalSanitizerGuardNode,
+    DataFlow::MethodCallNode {
     WhitelistContainmentCallSanitizer() {
-      exists (string name |
+      exists(string name |
         name = "contains" or
         name = "has" or
         name = "hasOwnProperty" or
-        name = "includes" |
+        name = "includes"
+      |
         getMethodName() = name
       )
     }
@@ -648,10 +627,7 @@ module TaintTracking {
       e = getArgument(0).asExpr()
     }
 
-    override predicate appliesTo(Configuration cfg) {
-      any()
-    }
-
+    override predicate appliesTo(Configuration cfg) { any() }
   }
 
   /**
@@ -671,12 +647,10 @@ module TaintTracking {
       outcome = true and
       e = getArgument(0).asExpr()
     }
-
   }
 
   /** A check of the form `if(x in o)`, which sanitizes `x` in its "then" branch. */
   class InSanitizer extends AdditionalSanitizerGuardNode, DataFlow::ValueNode {
-
     override InExpr astNode;
 
     override predicate sanitizes(boolean outcome, Expr e) {
@@ -684,23 +658,24 @@ module TaintTracking {
       e = astNode.getLeftOperand()
     }
 
-    override predicate appliesTo(Configuration cfg) {
-      any()
-    }
-
+    override predicate appliesTo(Configuration cfg) { any() }
   }
 
   /** A check of the form `if(o[x] != undefined)`, which sanitizes `x` in its "then" branch. */
   class UndefinedCheckSanitizer extends AdditionalSanitizerGuardNode, DataFlow::ValueNode {
     Expr x;
+
     override EqualityTest astNode;
 
     UndefinedCheckSanitizer() {
-      exists (IndexExpr idx, DataFlow::AnalyzedNode undef | astNode.hasOperands(idx, undef.asExpr()) |
+      exists(IndexExpr idx, DataFlow::AnalyzedNode undef |
+        astNode.hasOperands(idx, undef.asExpr())
+      |
         // one operand is of the form `o[x]`
-        idx = astNode.getAnOperand() and idx.getPropertyNameExpr() = x and
+        idx = astNode.getAnOperand() and
+        idx.getPropertyNameExpr() = x and
         // and the other one is guaranteed to be `undefined`
-        forex (InferredType tp | tp = undef.getAType() | tp = TTUndefined())
+        forex(InferredType tp | tp = undef.getAType() | tp = TTUndefined())
       )
     }
 
@@ -709,19 +684,17 @@ module TaintTracking {
       e = x
     }
 
-    override predicate appliesTo(Configuration cfg) {
-      any()
-    }
-
+    override predicate appliesTo(Configuration cfg) { any() }
   }
 
   /** A check of the form `if(whitelist.indexOf(x) != -1)`, which sanitizes `x` in its "then" branch. */
   class IndexOfSanitizer extends AdditionalSanitizerGuardNode, DataFlow::ValueNode {
     MethodCallExpr indexOf;
+
     override EqualityTest astNode;
 
     IndexOfSanitizer() {
-      exists (Expr index | astNode.hasOperands(indexOf, index) |
+      exists(Expr index | astNode.hasOperands(indexOf, index) |
         // one operand is of the form `whitelist.indexOf(x)`
         indexOf.getMethodName() = "indexOf" and
         // and the other one is -1
@@ -734,27 +707,27 @@ module TaintTracking {
       e = indexOf.getArgument(0)
     }
 
-    override predicate appliesTo(Configuration cfg) {
-      any()
-    }
-
+    override predicate appliesTo(Configuration cfg) { any() }
   }
 
-  /** 
-   * A check of the form `if(whitelist.indexOf(x) >= 0)`, which sanitizes `x` in its "then" branch. 
+  /**
+   * A check of the form `if(whitelist.indexOf(x) >= 0)`, which sanitizes `x` in its "then" branch.
    *
    * Similar relational checks are also supported.
    */
   private class RelationalIndexOfSanitizer extends AdditionalSanitizerGuardNode, DataFlow::ValueNode {
     MethodCallExpr indexOf;
+
     override RelationalComparison astNode;
+
     boolean polarity;
 
     RelationalIndexOfSanitizer() {
-      exists (Expr lesser, Expr greater |
+      exists(Expr lesser, Expr greater |
         astNode.getLesserOperand() = lesser and
         astNode.getGreaterOperand() = greater and
-        indexOf.getMethodName() = "indexOf" |
+        indexOf.getMethodName() = "indexOf"
+      |
         polarity = true and
         greater = indexOf and
         (
@@ -762,7 +735,7 @@ module TaintTracking {
           or
           lesser.getIntValue() = -1 and not astNode.isInclusive()
         )
-        or 
+        or
         polarity = false and
         lesser = indexOf and
         (
@@ -778,19 +751,17 @@ module TaintTracking {
       e = indexOf.getArgument(0)
     }
 
-    override predicate appliesTo(Configuration cfg) {
-      any()
-    }
-
+    override predicate appliesTo(Configuration cfg) { any() }
   }
 
-  /** 
+  /**
    * A check of the form `if(~whitelist.indexOf(x))`, which sanitizes `x` in its "then" branch.
-   * 
+   *
    * This sanitizer is equivalent to `if(whitelist.indexOf(x) != -1)`, since `~n = 0` iff `n = -1`.
    */
   private class BitwiseIndexOfSanitizer extends AdditionalSanitizerGuardNode, DataFlow::ValueNode {
     MethodCallExpr indexOf;
+
     override BitNotExpr astNode;
 
     BitwiseIndexOfSanitizer() {
@@ -803,29 +774,22 @@ module TaintTracking {
       e = indexOf.getArgument(0)
     }
 
-    override predicate appliesTo(Configuration cfg) {
-      any()
-    }
-
+    override predicate appliesTo(Configuration cfg) { any() }
   }
 
   /** A check of the form `if(x == 'some-constant')`, which sanitizes `x` in its "then" branch. */
   class ConstantComparison extends AdditionalSanitizerGuardNode, DataFlow::ValueNode {
     Expr x;
+
     override EqualityTest astNode;
 
-    ConstantComparison() {
-      astNode.hasOperands(x, any(ConstantExpr c))
-    }
+    ConstantComparison() { astNode.hasOperands(x, any(ConstantExpr c)) }
 
     override predicate sanitizes(boolean outcome, Expr e) {
       outcome = astNode.getPolarity() and x = e
     }
 
-    override predicate appliesTo(Configuration cfg) {
-      any()
-    }
-
+    override predicate appliesTo(Configuration cfg) { any() }
   }
 
   /**
@@ -848,7 +812,7 @@ module TaintTracking {
           or
           // ad hoc support for disjunctions:
           returnExpr.(LogOrExpr).getAnOperand() = sanitizer.asExpr() and sanitizerOutcome = false
-          |
+        |
           exists(SsaExplicitDefinition ssa |
             ssa.getDef().getSource() = returnExpr and
             ssa.getVariable().getAUse() = getAReturnedExpr()
@@ -879,9 +843,7 @@ module TaintTracking {
     /**
      * Holds if this function applies to the flow in `cfg`.
      */
-    predicate appliesTo(Configuration cfg) {
-      cfg.isBarrierGuard(sanitizer)
-    }
+    predicate appliesTo(Configuration cfg) { cfg.isBarrierGuard(sanitizer) }
   }
 
   /**
@@ -903,10 +865,11 @@ module TaintTracking {
    */
   private class PostMessageEventSanitizer extends AdditionalSanitizerGuardNode, DataFlow::ValueNode {
     VarAccess event;
+
     override EqualityTest astNode;
 
     PostMessageEventSanitizer() {
-      exists (string prop | prop = "origin" or prop = "source" |
+      exists(string prop | prop = "origin" or prop = "source" |
         astNode.getAnOperand().(PropAccess).accesses(event, prop) and
         event.mayReferToParameter(any(PostMessageEventHandler h).getEventParameter())
       )
@@ -917,10 +880,7 @@ module TaintTracking {
       e = event
     }
 
-    override predicate appliesTo(Configuration cfg) {
-      any()
-    }
-
+    override predicate appliesTo(Configuration cfg) { any() }
   }
 
   /**
@@ -929,7 +889,7 @@ module TaintTracking {
    *
    * DEPRECATED: use `AdditionalSanitizerGuardNode` instead.
    */
-  deprecated abstract class SanitizingGuard extends Expr {
+  abstract deprecated class SanitizingGuard extends Expr {
     /**
      * Holds if this expression sanitizes expression `e` for the purposes of taint-tracking
      * configuration `cfg`, provided it evaluates to `outcome`.
@@ -940,17 +900,12 @@ module TaintTracking {
   /**
    * Support registration of sanitizers with the deprecated type `SanitizingGuard`.
    */
-  deprecated private class AdditionalSanitizingGuard extends AdditionalSanitizerGuardNode, DataFlow::ValueNode {
-
+  deprecated private class AdditionalSanitizingGuard extends AdditionalSanitizerGuardNode,
+    DataFlow::ValueNode {
     override SanitizingGuard astNode;
 
-    override predicate sanitizes(boolean outcome, Expr e) {
-      astNode.sanitizes(_, outcome, e)
-    }
-
-    override predicate appliesTo(Configuration cfg) {
-      astNode.sanitizes(cfg, _, _)
-    }
+    override predicate sanitizes(boolean outcome, Expr e) { astNode.sanitizes(_, outcome, e) }
 
+    override predicate appliesTo(Configuration cfg) { astNode.sanitizes(cfg, _, _) }
   }
 }
diff --git a/javascript/ql/src/semmle/javascript/dataflow/TrackedNodes.qll b/javascript/ql/src/semmle/javascript/dataflow/TrackedNodes.qll
index 6c8fd81db4f2..78e6ff445f78 100644
--- a/javascript/ql/src/semmle/javascript/dataflow/TrackedNodes.qll
+++ b/javascript/ql/src/semmle/javascript/dataflow/TrackedNodes.qll
@@ -16,9 +16,7 @@ abstract class TrackedNode extends DataFlow::Node {
    * Holds if this node flows into `sink` in zero or more (possibly
    * inter-procedural) steps.
    */
-  predicate flowsTo(DataFlow::Node sink) {
-    NodeTracking::flowsTo(this, sink, _)
-  }
+  predicate flowsTo(DataFlow::Node sink) { NodeTracking::flowsTo(this, sink, _) }
 }
 
 /**
@@ -29,9 +27,7 @@ abstract class TrackedNode extends DataFlow::Node {
  */
 abstract class TrackedExpr extends Expr {
   predicate flowsTo(Expr sink) {
-    exists (TrackedExprNode ten | ten.asExpr() = this |
-      ten.flowsTo(DataFlow::valueNode(sink))
-    )
+    exists(TrackedExprNode ten | ten.asExpr() = this | ten.flowsTo(DataFlow::valueNode(sink)))
   }
 }
 
@@ -55,9 +51,9 @@ private module NodeTracking {
    */
   pragma[inline]
   predicate localFlowStep(DataFlow::Node pred, DataFlow::Node succ) {
-   pred = succ.getAPredecessor()
-   or
-   any(DataFlow::AdditionalFlowStep afs).step(pred, succ)
+    pred = succ.getAPredecessor()
+    or
+    any(DataFlow::AdditionalFlowStep afs).step(pred, succ)
   }
 
   /**
@@ -68,25 +64,25 @@ private module NodeTracking {
   private predicate basicFlowStep(DataFlow::Node pred, DataFlow::Node succ, PathSummary summary) {
     isRelevant(pred) and
     (
-     // Local flow
-     localFlowStep(pred, succ) and
-     summary = PathSummary::level()
-     or
-     // Flow through properties of objects
-     propertyFlowStep(pred, succ) and
-     summary = PathSummary::level()
-     or
-     // Flow through global variables
-     globalFlowStep(pred, succ) and
-     summary = PathSummary::level()
-     or
-     // Flow into function
-     callStep(pred, succ) and
-     summary = PathSummary::call()
-     or
-     // Flow out of function
-     returnStep(pred, succ) and
-     summary = PathSummary::return()
+      // Local flow
+      localFlowStep(pred, succ) and
+      summary = PathSummary::level()
+      or
+      // Flow through properties of objects
+      propertyFlowStep(pred, succ) and
+      summary = PathSummary::level()
+      or
+      // Flow through global variables
+      globalFlowStep(pred, succ) and
+      summary = PathSummary::level()
+      or
+      // Flow into function
+      callStep(pred, succ) and
+      summary = PathSummary::call()
+      or
+      // Flow out of function
+      returnStep(pred, succ) and
+      summary = PathSummary::return()
     )
   }
 
@@ -98,7 +94,7 @@ private module NodeTracking {
   private predicate isRelevant(DataFlow::Node nd) {
     nd instanceof TrackedNode
     or
-    exists (DataFlow::Node mid | isRelevant(mid) |
+    exists(DataFlow::Node mid | isRelevant(mid) |
       basicFlowStep(mid, nd, _)
       or
       basicStoreStep(mid, nd, _)
@@ -112,20 +108,22 @@ private module NodeTracking {
    * either `pred` is an argument of `f` and `succ` the corresponding parameter, or
    * `pred` is a variable definition whose value is captured by `f` at `succ`.
    */
-  private predicate callInputStep(Function f, DataFlow::Node invk,
-                                  DataFlow::Node pred, DataFlow::Node succ) {
+  private predicate callInputStep(
+    Function f, DataFlow::Node invk, DataFlow::Node pred, DataFlow::Node succ
+  ) {
     isRelevant(pred) and
     (
-     exists (Parameter parm |
-       argumentPassing(invk, pred, f, parm) and
-       succ = DataFlow::parameterNode(parm)
-     )
-     or
-     exists (SsaDefinition prevDef, SsaDefinition def |
-       pred = DataFlow::ssaDefinitionNode(prevDef) and
-       calls(invk, f) and captures(f, prevDef, def) and
-       succ = DataFlow::ssaDefinitionNode(def)
-     )
+      exists(Parameter parm |
+        argumentPassing(invk, pred, f, parm) and
+        succ = DataFlow::parameterNode(parm)
+      )
+      or
+      exists(SsaDefinition prevDef, SsaDefinition def |
+        pred = DataFlow::ssaDefinitionNode(prevDef) and
+        calls(invk, f) and
+        captures(f, prevDef, def) and
+        succ = DataFlow::ssaDefinitionNode(def)
+      )
     )
   }
 
@@ -134,13 +132,13 @@ private module NodeTracking {
    * that is captured by `f`, may flow to `nd` (possibly through callees) along
    * a path summarized by `summary`.
    */
-  private predicate reachableFromInput(Function f, DataFlow::Node invk,
-                                       DataFlow::Node input, DataFlow::Node nd,
-                                       PathSummary summary) {
+  private predicate reachableFromInput(
+    Function f, DataFlow::Node invk, DataFlow::Node input, DataFlow::Node nd, PathSummary summary
+  ) {
     callInputStep(f, invk, input, nd) and
     summary = PathSummary::level()
     or
-    exists (DataFlow::Node mid, PathSummary oldSummary, PathSummary newSummary |
+    exists(DataFlow::Node mid, PathSummary oldSummary, PathSummary newSummary |
       reachableFromInput(f, invk, input, mid, oldSummary) and
       flowStep(mid, nd, newSummary) and
       summary = oldSummary.append(newSummary)
@@ -153,7 +151,7 @@ private module NodeTracking {
    * possibly through callees.
    */
   private predicate flowThroughCall(DataFlow::Node input, DataFlow::Node invk) {
-    exists (Function f, DataFlow::ValueNode ret |
+    exists(Function f, DataFlow::ValueNode ret |
       ret.asExpr() = f.getAReturnedExpr() and
       reachableFromInput(f, invk, input, ret, _)
     )
@@ -162,12 +160,13 @@ private module NodeTracking {
   /**
    * Holds if `pred` may flow into property `prop` of `succ` along a path summarized by `summary`.
    */
-  private predicate storeStep(DataFlow::Node pred, DataFlow::SourceNode succ, string prop,
-                              PathSummary summary) {
+  private predicate storeStep(
+    DataFlow::Node pred, DataFlow::SourceNode succ, string prop, PathSummary summary
+  ) {
     basicStoreStep(pred, succ, prop) and
     summary = PathSummary::level()
     or
-    exists (Function f, DataFlow::Node mid, DataFlow::SourceNode base |
+    exists(Function f, DataFlow::Node mid, DataFlow::SourceNode base |
       // `f` stores its parameter `pred` in property `prop` of a value that it returns,
       // and `succ` is an invocation of `f`
       reachableFromInput(f, succ, pred, mid, summary) and
@@ -180,11 +179,12 @@ private module NodeTracking {
    * Holds if `rhs` is the right-hand side of a write to property `prop`, and `nd` is reachable
    * from the base of that write (possibly through callees) along a path summarized by `summary`.
    */
-  private predicate reachableFromStoreBase(string prop, DataFlow::Node rhs, DataFlow::Node nd,
-                                           PathSummary summary) {
+  private predicate reachableFromStoreBase(
+    string prop, DataFlow::Node rhs, DataFlow::Node nd, PathSummary summary
+  ) {
     storeStep(rhs, nd, prop, summary)
     or
-    exists (DataFlow::Node mid, PathSummary oldSummary, PathSummary newSummary |
+    exists(DataFlow::Node mid, PathSummary oldSummary, PathSummary newSummary |
       reachableFromStoreBase(prop, rhs, mid, oldSummary) and
       flowStep(mid, nd, newSummary) and
       summary = oldSummary.append(newSummary)
@@ -197,9 +197,10 @@ private module NodeTracking {
    *
    * In other words, `pred` may flow to `succ` through a property.
    */
-  private predicate flowThroughProperty(DataFlow::Node pred, DataFlow::Node succ,
-                                        PathSummary summary) {
-    exists (string prop, DataFlow::Node base |
+  private predicate flowThroughProperty(
+    DataFlow::Node pred, DataFlow::Node succ, PathSummary summary
+  ) {
+    exists(string prop, DataFlow::Node base |
       reachableFromStoreBase(prop, pred, base, summary) and
       loadStep(base, succ, prop)
     )
@@ -228,7 +229,7 @@ private module NodeTracking {
     source = nd and
     summary = PathSummary::level()
     or
-    exists (DataFlow::Node pred, PathSummary oldSummary, PathSummary newSummary |
+    exists(DataFlow::Node pred, PathSummary oldSummary, PathSummary newSummary |
       flowsTo(source, pred, oldSummary) and
       flowStep(pred, nd, newSummary) and
       summary = oldSummary.append(newSummary)
diff --git a/javascript/ql/src/semmle/javascript/dataflow/TypeInference.qll b/javascript/ql/src/semmle/javascript/dataflow/TypeInference.qll
index ffaaeddeefb9..39401ed4a1d7 100644
--- a/javascript/ql/src/semmle/javascript/dataflow/TypeInference.qll
+++ b/javascript/ql/src/semmle/javascript/dataflow/TypeInference.qll
@@ -28,11 +28,9 @@
 import javascript
 import AbstractValues
 import AbstractProperties
-
 private import InferredTypes
 private import Refinements
 private import internal.AbstractValuesImpl
-
 import internal.BasicExprTypeInference
 import internal.InterModuleTypeInference
 import internal.InterProceduralTypeInference
@@ -47,9 +45,7 @@ class AnalyzedNode extends DataFlow::Node {
    * Gets another data flow node whose value flows into this node in one local step
    * (that is, not involving global variables).
    */
-  AnalyzedNode localFlowPred() {
-    result = getAPredecessor()
-  }
+  AnalyzedNode localFlowPred() { result = getAPredecessor() }
 
   /**
    * Gets an abstract value that this node may evaluate to at runtime.
@@ -61,9 +57,7 @@ class AnalyzedNode extends DataFlow::Node {
    * instances is also performed.
    */
   cached
-  AbstractValue getAValue() {
-    result = getALocalValue()
-  }
+  AbstractValue getAValue() { result = getALocalValue() }
 
   /**
    * INTERNAL: Do not use.
@@ -82,39 +76,31 @@ class AnalyzedNode extends DataFlow::Node {
     // feed back the results from the (value) flow analysis into
     // the control flow analysis, so all flow predecessors are
     // considered as sources
-    result = localFlowPred().getALocalValue() or
+    result = localFlowPred().getALocalValue()
+    or
     // model flow that isn't captured by the data flow graph
-    exists (DataFlow::Incompleteness cause |
+    exists(DataFlow::Incompleteness cause |
       isIncomplete(cause) and result = TIndefiniteAbstractValue(cause)
     )
   }
 
   /** Gets a type inferred for this node. */
-  pragma[nomagic] InferredType getAType() {
-    result = getAValue().getType()
-  }
+  pragma[nomagic]
+  InferredType getAType() { result = getAValue().getType() }
 
   /**
    * Gets a primitive type to which the value of this node can be coerced.
    */
-  PrimitiveType getAPrimitiveType() {
-    result = getAValue().toPrimitive().getType()
-  }
+  PrimitiveType getAPrimitiveType() { result = getAValue().toPrimitive().getType() }
 
   /** Gets a Boolean value that this node evaluates to. */
-  boolean getABooleanValue() {
-    result = getAValue().getBooleanValue()
-  }
+  boolean getABooleanValue() { result = getAValue().getBooleanValue() }
 
   /** Gets the unique Boolean value that this node evaluates to, if any. */
-  boolean getTheBooleanValue() {
-    forex (boolean bv | bv = getABooleanValue() | result = bv)
-  }
+  boolean getTheBooleanValue() { forex(boolean bv | bv = getABooleanValue() | result = bv) }
 
   /** Gets the unique type inferred for this node, if any. */
-  InferredType getTheType() {
-    count(getAType()) = 1 and result = getAType()
-  }
+  InferredType getTheType() { count(getAType()) = 1 and result = getAType() }
 
   /**
    * Gets a pretty-printed representation of all types inferred for this node
@@ -124,13 +110,16 @@ class AnalyzedNode extends DataFlow::Node {
    * particular addition) may have more than one inferred type.
    */
   string ppTypes() {
-    exists (int n | n = getNumTypes() |
+    exists(int n | n = getNumTypes() |
       // inferred no types
-      n = 0 and result = "" or
+      n = 0 and result = ""
+      or
       // inferred a single type
-      n = 1 and result = getAType().toString() or
+      n = 1 and result = getAType().toString()
+      or
       // inferred all types
-      n = count(InferredType it) and result = ppAllTypeTags() or
+      n = count(InferredType it) and result = ppAllTypeTags()
+      or
       // the general case: more than one type, but not all types
       // first pretty-print as a comma separated list, then replace last comma by "or"
       result = (getType(1) + ", " + ppTypes(2)).regexpReplaceAll(", ([^,]++)$", " or $1")
@@ -144,14 +133,12 @@ class AnalyzedNode extends DataFlow::Node {
    * and one less than the total number of types.
    */
   private string getType(int i) {
-    getNumTypes() in [2..count(InferredType it)-1] and
+    getNumTypes() in [2 .. count(InferredType it) - 1] and
     result = rank[i](InferredType tp | tp = getAType() | tp.toString())
   }
 
   /** Gets the number of types inferred for this node. */
-  private int getNumTypes() {
-    result = count(getAType())
-  }
+  private int getNumTypes() { result = count(getAType()) }
 
   /**
    * Gets a pretty-printed comma-separated list of all types inferred for this node,
@@ -160,23 +147,21 @@ class AnalyzedNode extends DataFlow::Node {
    * the all-types case are handled specially above.
    */
   private string ppTypes(int i) {
-    exists (int n | n = getNumTypes() and n in [2..count(InferredType it)-1] |
-      i = n and result = getType(i) or
-      i in [2..n-1] and result = getType(i) + ", " + ppTypes(i+1)
+    exists(int n | n = getNumTypes() and n in [2 .. count(InferredType it) - 1] |
+      i = n and result = getType(i)
+      or
+      i in [2 .. n - 1] and result = getType(i) + ", " + ppTypes(i + 1)
     )
   }
 
   /** Holds if the flow analysis can infer at least one abstract value for this node. */
-  predicate hasFlow() {
-    exists(getAValue())
-  }
+  predicate hasFlow() { exists(getAValue()) }
 }
 
 /**
  * A value node for which analysis results are available.
  */
-class AnalyzedValueNode extends AnalyzedNode, DataFlow::ValueNode {
-}
+class AnalyzedValueNode extends AnalyzedNode, DataFlow::ValueNode { }
 
 /**
  * A module for which analysis results are available.
@@ -193,16 +178,12 @@ class AnalyzedModule extends TopLevel {
   AnalyzedModule() { this = m }
 
   /** Gets the name of this module. */
-  string getName() {
-    result = m.getName()
-  }
+  string getName() { result = m.getName() }
 
   /**
    * Gets the abstract value representing this module's `module` object.
    */
-  AbstractModuleObject getModuleObject() {
-    result.getModule() = this
-  }
+  AbstractModuleObject getModuleObject() { result.getModule() = this }
 
   /**
    * Gets the abstract property representing this module's `module.exports`
@@ -217,23 +198,21 @@ class AnalyzedModule extends TopLevel {
    * Gets an abstract value inferred for this module's `module.exports`
    * property.
    */
-  AbstractValue getAnExportsValue() {
-    result = getExportsProperty().getAValue()
-  }
+  AbstractValue getAnExportsValue() { result = getExportsProperty().getAValue() }
 
   /**
    * Gets an abstract value representing a value exported by this module
    * under the given `name`.
    */
   AbstractValue getAnExportedValue(string name) {
-    exists (AbstractValue exports | exports = getAnExportsValue() |
+    exists(AbstractValue exports | exports = getAnExportsValue() |
       // CommonJS modules export `module.exports` as their `default`
       // export in an ES2015 setting
       not m instanceof ES2015Module and
       name = "default" and
       result = exports
       or
-      exists (AbstractProperty exported |
+      exists(AbstractProperty exported |
         exported.getBase() = exports and
         exported.getPropertyName() = name and
         result = exported.getAValue()
@@ -263,7 +242,7 @@ class AnalyzedFunction extends DataFlow::AnalyzedValueNode {
       mayReturnImplicitly()
       or
       // or because there is a bare `return;` statement
-      exists (ReturnStmt ret | ret = astNode.getAReturnStmt() | not exists(ret.getExpr()))
+      exists(ReturnStmt ret | ret = astNode.getAReturnStmt() | not exists(ret.getExpr()))
     ) and
     result = TAbstractUndefined()
   }
@@ -277,7 +256,7 @@ class AnalyzedFunction extends DataFlow::AnalyzedValueNode {
    * account for `finally` blocks and does not check reachability.
    */
   private predicate mayReturnImplicitly() {
-    exists (ConcreteControlFlowNode final |
+    exists(ConcreteControlFlowNode final |
       final.getContainer() = astNode and
       final.isAFinalNode() and
       not final instanceof ReturnStmt and
@@ -292,9 +271,7 @@ class AnalyzedFunction extends DataFlow::AnalyzedValueNode {
 private class AnalyzedGeneratorFunction extends AnalyzedFunction {
   AnalyzedGeneratorFunction() { astNode.isGenerator() }
 
-  override AbstractValue getAReturnValue() {
-    result = TAbstractOtherObject()
-  }
+  override AbstractValue getAReturnValue() { result = TAbstractOtherObject() }
 }
 
 /**
@@ -303,7 +280,5 @@ private class AnalyzedGeneratorFunction extends AnalyzedFunction {
 private class AnalyzedAsyncFunction extends AnalyzedFunction {
   AnalyzedAsyncFunction() { astNode.isAsync() }
 
-  override AbstractValue getAReturnValue() {
-    result = TAbstractOtherObject()
-  }
+  override AbstractValue getAReturnValue() { result = TAbstractOtherObject() }
 }
diff --git a/javascript/ql/src/semmle/javascript/dataflow/internal/AbstractPropertiesImpl.qll b/javascript/ql/src/semmle/javascript/dataflow/internal/AbstractPropertiesImpl.qll
index 4acf795c7eca..f90177f737d7 100644
--- a/javascript/ql/src/semmle/javascript/dataflow/internal/AbstractPropertiesImpl.qll
+++ b/javascript/ql/src/semmle/javascript/dataflow/internal/AbstractPropertiesImpl.qll
@@ -25,14 +25,13 @@ newtype TAbstractProperty =
     prop = "__proto__"
   }
 
-
 /**
  * Holds if the result is known to be an initial value of property `propertyName` of one
  * of the concrete objects represented by `baseVal`.
  */
 AbstractValue getAnInitialPropertyValue(DefiniteAbstractValue baseVal, string propertyName) {
   // initially, `module.exports === exports`
-  exists (Module m |
+  exists(Module m |
     baseVal = TAbstractModuleObject(m) and
     propertyName = "exports" and
     result = TAbstractExportsObject(m)
@@ -42,7 +41,7 @@ AbstractValue getAnInitialPropertyValue(DefiniteAbstractValue baseVal, string pr
   result = getAnInitialMemberValue(getMember(baseVal, propertyName))
   or
   // object properties
-  exists (ValueProperty p |
+  exists(ValueProperty p |
     baseVal.(AbstractObjectLiteral).getObjectExpr() = p.getObjectExpr() and
     propertyName = p.getName() and
     result = p.getInit().analyze().getALocalValue()
@@ -59,11 +58,8 @@ AbstractValue getAnInitialPropertyValue(DefiniteAbstractValue baseVal, string pr
  * with the given `name`.
  */
 private MemberDefinition getMember(DefiniteAbstractValue baseVal, string name) {
-  exists (ClassDefinition c | result = c.getMember(name) |
-    if result.isStatic() then
-      baseVal = TAbstractClass(c)
-    else
-      baseVal = AbstractInstance::of(c)
+  exists(ClassDefinition c | result = c.getMember(name) |
+    if result.isStatic() then baseVal = TAbstractClass(c) else baseVal = AbstractInstance::of(c)
   )
 }
 
diff --git a/javascript/ql/src/semmle/javascript/dataflow/internal/AbstractValuesImpl.qll b/javascript/ql/src/semmle/javascript/dataflow/internal/AbstractValuesImpl.qll
index 36a22a95f090..597290a78b9f 100644
--- a/javascript/ql/src/semmle/javascript/dataflow/internal/AbstractValuesImpl.qll
+++ b/javascript/ql/src/semmle/javascript/dataflow/internal/AbstractValuesImpl.qll
@@ -9,61 +9,45 @@ private import semmle.javascript.dataflow.InferredTypes
 import semmle.javascript.dataflow.CustomAbstractValueDefinitions
 
 /** An abstract value inferred by the flow analysis. */
-cached newtype TAbstractValue =
+cached
+newtype TAbstractValue =
   /** An abstract representation of `null`. */
-  TAbstractNull()
-  or
+  TAbstractNull() or
   /** An abstract representation of `undefined`. */
-  TAbstractUndefined()
-  or
+  TAbstractUndefined() or
   /** An abstract representation of Boolean value `b`. */
-  TAbstractBoolean(boolean b) { b = true or b = false }
-  or
+  TAbstractBoolean(boolean b) { b = true or b = false } or
   /** An abstract representation of the number (or bigint) zero. */
-  TAbstractZero()
-  or
+  TAbstractZero() or
   /** An abstract representation of a non-zero number (or bigint). */
-  TAbstractNonZero()
-  or
+  TAbstractNonZero() or
   /** An abstract representation of the empty string. */
-  TAbstractEmpty()
-  or
+  TAbstractEmpty() or
   /** An abstract representation of a string that coerces to a number (and not `NaN`). */
-  TAbstractNumString()
-  or
+  TAbstractNumString() or
   /** An abstract representation of a non-empty string that does not coerce to a number. */
-  TAbstractOtherString()
-  or
+  TAbstractOtherString() or
   /** An abstract representation of a regular expression object. */
-  TAbstractRegExp()
-  or
+  TAbstractRegExp() or
   /** An abstract representation of a function object corresponding to function `f`. */
-  TAbstractFunction(Function f)
-  or
+  TAbstractFunction(Function f) or
   /** An abstract representation of a class object corresponding to class `c`. */
-  TAbstractClass(ClassDefinition c)
-  or
+  TAbstractClass(ClassDefinition c) or
   /** An abstract representation of a Date object. */
-  TAbstractDate()
-  or
+  TAbstractDate() or
   /**
    * An abstract representation of the arguments object of a function object
    * corresponding to function `f`.
    */
-  TAbstractArguments(Function f) { exists(f.getArgumentsVariable().getAnAccess()) }
-  or
+  TAbstractArguments(Function f) { exists(f.getArgumentsVariable().getAnAccess()) } or
   /** An abstract representation of the global object. */
-  TAbstractGlobalObject()
-  or
+  TAbstractGlobalObject() or
   /** An abstract representation of a `module` object. */
-  TAbstractModuleObject(Module m)
-  or
+  TAbstractModuleObject(Module m) or
   /** An abstract representation of a `exports` object. */
-  TAbstractExportsObject(Module m)
-  or
+  TAbstractExportsObject(Module m) or
   /** An abstract representation of all objects arising from an object literal expression. */
-  TAbstractObjectLiteral(ObjectExpr oe)
-  or
+  TAbstractObjectLiteral(ObjectExpr oe) or
   /**
    * An abstract value representing all instances of a class or function `F`,
    * as well as the default prototype of `F` (that is, the initial value of
@@ -72,43 +56,35 @@ cached newtype TAbstractValue =
   TAbstractInstance(AbstractCallable ac) {
     ac instanceof AbstractClass
     or
-    exists (Function f | ac = TAbstractFunction(f) |
+    exists(Function f | ac = TAbstractFunction(f) |
       not f.isNonConstructible(_) and
       // constructors are covered by the first disjunct
       not f instanceof Constructor
     )
-  }
-  or
+  } or
   /** An abstract representation of an object not covered by the other abstract values. */
-  TAbstractOtherObject()
-  or
+  TAbstractOtherObject() or
   /**
    * An abstract representation of an indefinite value that represents a function or class,
    * where `cause` records the cause of the incompleteness.
    */
-  TIndefiniteFunctionOrClass(DataFlow::Incompleteness cause)
-  or
+  TIndefiniteFunctionOrClass(DataFlow::Incompleteness cause) or
   /**
    * An abstract representation of an indefinite value that represents an object,
    * but not a function or class, with `cause` recording the cause of the incompleteness.
    */
-  TIndefiniteObject(DataFlow::Incompleteness cause)
-  or
+  TIndefiniteObject(DataFlow::Incompleteness cause) or
   /**
    * Abstract representation of indefinite values that represent any value, with
    * `cause` recording the cause of the incompleteness.
    */
-  TIndefiniteAbstractValue(DataFlow::Incompleteness cause)
-  or
+  TIndefiniteAbstractValue(DataFlow::Incompleteness cause) or
   /** A custom abstract value induced by `tag`. */
-  TCustomAbstractValue(CustomAbstractValueTag tag)
-  or
+  TCustomAbstractValue(CustomAbstractValueTag tag) or
   /** A custom abstract value induced by `def`. */
   TCustomAbstractValueFromDefinition(CustomAbstractValueDefinition def)
 
 /**
  * Gets a definite abstract value with the given type.
  */
-DefiniteAbstractValue abstractValueOfType(TypeTag type) {
-  result.getType() = type
-}
+DefiniteAbstractValue abstractValueOfType(TypeTag type) { result.getType() = type }
diff --git a/javascript/ql/src/semmle/javascript/dataflow/internal/AccessPaths.qll b/javascript/ql/src/semmle/javascript/dataflow/internal/AccessPaths.qll
index 2f246f5a7cb4..9e24c73a8d01 100644
--- a/javascript/ql/src/semmle/javascript/dataflow/internal/AccessPaths.qll
+++ b/javascript/ql/src/semmle/javascript/dataflow/internal/AccessPaths.qll
@@ -22,12 +22,9 @@ import javascript
  * the value of an SSA variable.
  */
 private newtype PropertyName =
-  StaticPropertyName(string name) {
-    exists (PropAccess pa | name = pa.getPropertyName())
-  }
-  or
+  StaticPropertyName(string name) { exists(PropAccess pa | name = pa.getPropertyName()) } or
   DynamicPropertyName(SsaVariable var) {
-    exists (PropAccess pa | pa.getPropertyNameExpr() = var.getAUse())
+    exists(PropAccess pa | pa.getPropertyNameExpr() = var.getAUse())
   }
 
 /**
@@ -36,7 +33,7 @@ private newtype PropertyName =
 private PropertyName getPropertyName(PropAccess pacc) {
   result = StaticPropertyName(pacc.getPropertyName())
   or
-  exists (SsaVariable var |
+  exists(SsaVariable var |
     pacc.getPropertyNameExpr() = var.getAUse() and
     result = DynamicPropertyName(var)
   )
@@ -47,10 +44,9 @@ private PropertyName getPropertyName(PropAccess pacc) {
  * where each property name is either constant or itself an SSA variable.
  */
 private newtype TAccessPath =
-  MkRoot(SsaVariable var)
-  or
+  MkRoot(SsaVariable var) or
   MkAccessStep(AccessPath base, PropertyName name) {
-    exists (PropAccess pacc |
+    exists(PropAccess pacc |
       pacc.getBase() = base.getAnInstance() and
       getPropertyName(pacc) = name
     )
@@ -65,12 +61,12 @@ class AccessPath extends TAccessPath {
    * Gets an expression in `bb` represented by this access path.
    */
   Expr getAnInstanceIn(BasicBlock bb) {
-    exists (SsaVariable var |
+    exists(SsaVariable var |
       this = MkRoot(var) and
       result = var.getAUseIn(bb)
     )
     or
-    exists (PropertyName name |
+    exists(PropertyName name |
       result = getABaseInstanceIn(bb, name) and
       getPropertyName(result) = name
     )
@@ -86,7 +82,7 @@ class AccessPath extends TAccessPath {
    */
   pragma[noinline]
   private PropAccess getABaseInstanceIn(BasicBlock bb, PropertyName name) {
-    exists (AccessPath base | this = MkAccessStep(base, name) |
+    exists(AccessPath base | this = MkAccessStep(base, name) |
       result.getBase() = base.getAnInstanceIn(bb)
     )
   }
@@ -94,22 +90,20 @@ class AccessPath extends TAccessPath {
   /**
    * Gets an expression represented by this access path.
    */
-  Expr getAnInstance() {
-    result = getAnInstanceIn(_)
-  }
+  Expr getAnInstance() { result = getAnInstanceIn(_) }
 
   /**
    * Gets a textual representation of this access path.
    */
   string toString() {
-    exists (SsaVariable var | this = MkRoot(var) |
-      result = var.getSourceVariable().getName()
-    )
+    exists(SsaVariable var | this = MkRoot(var) | result = var.getSourceVariable().getName())
     or
-    exists (AccessPath base, PropertyName name, string rest |
+    exists(AccessPath base, PropertyName name, string rest |
       rest = "." + any(string s | name = StaticPropertyName(s))
       or
-      rest = "[" + any(SsaVariable var | name = DynamicPropertyName(var)).getSourceVariable().getName() + "]" |
+      rest = "[" +
+          any(SsaVariable var | name = DynamicPropertyName(var)).getSourceVariable().getName() + "]"
+    |
       result = base.toString() + rest and
       this = MkAccessStep(base, name)
     )
diff --git a/javascript/ql/src/semmle/javascript/dataflow/internal/BasicExprTypeInference.qll b/javascript/ql/src/semmle/javascript/dataflow/internal/BasicExprTypeInference.qll
index 57e0ac44f977..fdb09ef5ee77 100644
--- a/javascript/ql/src/semmle/javascript/dataflow/internal/BasicExprTypeInference.qll
+++ b/javascript/ql/src/semmle/javascript/dataflow/internal/BasicExprTypeInference.qll
@@ -16,34 +16,33 @@ private class AnalyzedLiteral extends DataFlow::AnalyzedValueNode {
   override Literal astNode;
 
   override AbstractValue getALocalValue() {
-    exists (string value | value = astNode.getValue() |
+    exists(string value | value = astNode.getValue() |
       // flow analysis for `null` literals
       astNode instanceof NullLiteral and result = TAbstractNull()
       or
       // flow analysis for Boolean literals
-      astNode instanceof BooleanLiteral and (
-        value = "true" and result = TAbstractBoolean(true) or
+      astNode instanceof BooleanLiteral and
+      (
+        value = "true" and result = TAbstractBoolean(true)
+        or
         value = "false" and result = TAbstractBoolean(false)
       )
       or
       // flow analysis for number literals
       (astNode instanceof NumberLiteral or astNode instanceof BigIntLiteral) and
-      exists (float fv | fv = value.toFloat() |
-        if fv = 0.0 or fv = -0.0 then
-          result = TAbstractZero()
-        else
-          result = TAbstractNonZero()
+      exists(float fv | fv = value.toFloat() |
+        if fv = 0.0 or fv = -0.0 then result = TAbstractZero() else result = TAbstractNonZero()
       )
       or
       // flow analysis for string literals
       astNode instanceof StringLiteral and
       (
-        if value = "" then
-          result = TAbstractEmpty()
-        else if exists(value.toFloat()) then
-          result = TAbstractNumString()
+        if value = ""
+        then result = TAbstractEmpty()
         else
-          result = TAbstractOtherString()
+          if exists(value.toFloat())
+          then result = TAbstractNumString()
+          else result = TAbstractOtherString()
       )
       or
       // flow analysis for regular expression literals
@@ -111,7 +110,7 @@ private class AnalyzedNamespaceDeclaration extends DataFlow::AnalyzedValueNode {
   }
 
   AbstractValue getPreviousValue() {
-    exists (AnalyzedSsaDefinition def |
+    exists(AnalyzedSsaDefinition def |
       def.getVariable().getAUse() = astNode.getId() and
       result = def.getAnRhsValue()
     )
@@ -148,7 +147,7 @@ private class AnalyzedJSXQualifiedName extends DataFlow::AnalyzedValueNode {
 /**
  * Flow analysis for empty JSX expressions.
  */
-private class AnalyzedJSXEmptyExpression extends DataFlow::AnalyzedValueNode{
+private class AnalyzedJSXEmptyExpression extends DataFlow::AnalyzedValueNode {
   override JSXEmptyExpr astNode;
 
   override AbstractValue getALocalValue() { result = TAbstractUndefined() }
@@ -158,20 +157,18 @@ private class AnalyzedJSXEmptyExpression extends DataFlow::AnalyzedValueNode{
  * Flow analysis for `super` in super constructor calls.
  */
 private class AnalyzedSuperCall extends DataFlow::AnalyzedValueNode {
-  AnalyzedSuperCall() {
-    astNode = any(SuperCall sc).getCallee().getUnderlyingValue()
-  }
+  AnalyzedSuperCall() { astNode = any(SuperCall sc).getCallee().getUnderlyingValue() }
 
   override AbstractValue getALocalValue() {
-    exists (MethodDefinition md, DataFlow::AnalyzedNode sup, AbstractValue supVal |
+    exists(MethodDefinition md, DataFlow::AnalyzedNode sup, AbstractValue supVal |
       md.getBody() = asExpr().getEnclosingFunction() and
       sup = md.getDeclaringClass().getSuperClass().analyze() and
-      supVal = sup.getALocalValue() |
+      supVal = sup.getALocalValue()
+    |
       // `extends null` is treated specially in a way that we cannot model
-      if supVal instanceof AbstractNull then
-        result = TIndefiniteFunctionOrClass("heap")
-      else
-        result = supVal
+      if supVal instanceof AbstractNull
+      then result = TIndefiniteFunctionOrClass("heap")
+      else result = supVal
     )
   }
 }
@@ -201,9 +198,10 @@ private class AnalyzedNewExpr extends DataFlow::AnalyzedValueNode {
    * instance, which we cannot track.
    */
   private predicate isIndefinite() {
-    exists (DataFlow::AnalyzedNode callee, AbstractValue calleeVal |
+    exists(DataFlow::AnalyzedNode callee, AbstractValue calleeVal |
       callee = astNode.(NewExpr).getCallee().analyze() and
-      calleeVal = callee.getALocalValue() |
+      calleeVal = callee.getALocalValue()
+    |
       calleeVal.isIndefinite(_) or
       exists(calleeVal.(AbstractClass).getClass().getSuperClass()) or
       exists(calleeVal.(AbstractCallable).getFunction().getAReturnedExpr())
@@ -214,11 +212,11 @@ private class AnalyzedNewExpr extends DataFlow::AnalyzedValueNode {
 /**
  * Flow analysis for `new` expressions that create class/function instances.
  */
-private class NewInstance extends DataFlow::AnalyzedValueNode{
+private class NewInstance extends DataFlow::AnalyzedValueNode {
   override NewExpr astNode;
 
   override AbstractValue getALocalValue() {
-    exists (DataFlow::AnalyzedNode callee |
+    exists(DataFlow::AnalyzedNode callee |
       callee = astNode.(NewExpr).getCallee().analyze() and
       result = TAbstractInstance(callee.getALocalValue())
     )
@@ -231,9 +229,7 @@ private class NewInstance extends DataFlow::AnalyzedValueNode{
 private class AnalyzedBinaryExpr extends DataFlow::AnalyzedValueNode {
   override BinaryExpr astNode;
 
-  AnalyzedBinaryExpr() {
-    not astNode instanceof LogicalBinaryExpr
-  }
+  AnalyzedBinaryExpr() { not astNode instanceof LogicalBinaryExpr }
 
   override AbstractValue getALocalValue() {
     // most binary expressions are arithmetic expressions;
@@ -246,22 +242,18 @@ private class AnalyzedBinaryExpr extends DataFlow::AnalyzedValueNode {
  * Gets a primitive type to which the local value of `e` can be coerced.
  */
 private PrimitiveType getALocalPrimitiveType(Expr e) {
-    result = e.analyze().getALocalValue().toPrimitive().getType()
+  result = e.analyze().getALocalValue().toPrimitive().getType()
 }
 
 /**
  * Holds if `e` may hold a string value.
  */
-private predicate maybeString(Expr e) {
-  getALocalPrimitiveType(e) = TTString()
-}
+private predicate maybeString(Expr e) { getALocalPrimitiveType(e) = TTString() }
 
 /**
  * Holds if `e` may hold a non-string value.
  */
-private predicate maybeNonString(Expr e) {
-  getALocalPrimitiveType(e) != TTString()
-}
+private predicate maybeNonString(Expr e) { getALocalPrimitiveType(e) != TTString() }
 
 /**
  * Holds if `e` is a `+` or `+=` expression that could be interpreted as a string append
@@ -278,7 +270,8 @@ private predicate isStringAppend(Expr e) {
  */
 private predicate isAddition(Expr e) {
   (e instanceof AddExpr or e instanceof AssignAddExpr) and
-  maybeNonString(e.getChildExpr(0)) and maybeNonString(e.getChildExpr(1))
+  maybeNonString(e.getChildExpr(0)) and
+  maybeNonString(e.getChildExpr(1))
 }
 
 /**
@@ -288,7 +281,8 @@ private class AnalyzedAddExpr extends AnalyzedBinaryExpr {
   override AddExpr astNode;
 
   override AbstractValue getALocalValue() {
-    isStringAppend(astNode) and result = abstractValueOfType(TTString()) or
+    isStringAppend(astNode) and result = abstractValueOfType(TTString())
+    or
     isAddition(astNode) and result = abstractValueOfType(TTNumber())
   }
 }
@@ -305,7 +299,7 @@ private class AnalyzedComparison extends AnalyzedBinaryExpr {
 /**
  * Flow analysis for `in` expressions.
  */
-private class AnalyzedInExpr extends AnalyzedBinaryExpr  {
+private class AnalyzedInExpr extends AnalyzedBinaryExpr {
   override InExpr astNode;
 
   override AbstractValue getALocalValue() { result = TAbstractBoolean(_) }
@@ -320,7 +314,6 @@ private class AnalyzedInstanceofExpr extends AnalyzedBinaryExpr {
   override AbstractValue getALocalValue() { result = TAbstractBoolean(_) }
 }
 
-
 /**
  * Flow analysis for unary expressions (except for spread, which is not
  * semantically a unary expression).
@@ -328,9 +321,7 @@ private class AnalyzedInstanceofExpr extends AnalyzedBinaryExpr {
 private class AnalyzedUnaryExpr extends DataFlow::AnalyzedValueNode {
   override UnaryExpr astNode;
 
-  AnalyzedUnaryExpr() {
-    not astNode instanceof SpreadElement
-  }
+  AnalyzedUnaryExpr() { not astNode instanceof SpreadElement }
 
   override AbstractValue getALocalValue() {
     // many unary expressions are arithmetic expressions;
@@ -364,9 +355,10 @@ private class AnalyzedLogNotExpr extends AnalyzedUnaryExpr {
   override LogNotExpr astNode;
 
   override AbstractValue getALocalValue() {
-    exists (AbstractValue op | op = astNode.getOperand().analyze().getALocalValue() |
-      exists (boolean bv | bv = op.getBooleanValue() |
-        bv = true and result = TAbstractBoolean(false) or
+    exists(AbstractValue op | op = astNode.getOperand().analyze().getALocalValue() |
+      exists(boolean bv | bv = op.getBooleanValue() |
+        bv = true and result = TAbstractBoolean(false)
+        or
         bv = false and result = TAbstractBoolean(true)
       )
     )
@@ -382,7 +374,6 @@ private class AnalyzedDeleteExpr extends AnalyzedUnaryExpr {
   override AbstractValue getALocalValue() { result = TAbstractBoolean(_) }
 }
 
-
 /**
  * Flow analysis for increment and decrement expressions.
  */
@@ -392,7 +383,6 @@ private class AnalyzedUpdateExpr extends DataFlow::AnalyzedValueNode {
   override AbstractValue getALocalValue() { result = abstractValueOfType(TTNumber()) }
 }
 
-
 /**
  * Flow analysis for compound assignments.
  */
@@ -409,7 +399,8 @@ private class AnalyzedAssignAddExpr extends AnalyzedCompoundAssignExpr {
   override AssignAddExpr astNode;
 
   override AbstractValue getALocalValue() {
-    isStringAppend(astNode) and result = abstractValueOfType(TTString()) or
+    isStringAppend(astNode) and result = abstractValueOfType(TTString())
+    or
     isAddition(astNode) and result = abstractValueOfType(TTNumber())
   }
 }
diff --git a/javascript/ql/src/semmle/javascript/dataflow/internal/FlowSteps.qll b/javascript/ql/src/semmle/javascript/dataflow/internal/FlowSteps.qll
index f70f6ea20af9..4ff3c3debaef 100644
--- a/javascript/ql/src/semmle/javascript/dataflow/internal/FlowSteps.qll
+++ b/javascript/ql/src/semmle/javascript/dataflow/internal/FlowSteps.qll
@@ -21,10 +21,10 @@ predicate shouldTrackProperties(AbstractValue obj) {
  * Holds if `invk` may invoke `f`.
  */
 predicate calls(DataFlow::InvokeNode invk, Function f) {
-  if invk.isIndefinite("global") then
-    (f = invk.getACallee() and f.getFile() = invk.getFile())
-  else
-    f = invk.getACallee()
+  if invk.isIndefinite("global")
+  then (
+    f = invk.getACallee() and f.getFile() = invk.getFile()
+  ) else f = invk.getACallee()
 }
 
 /**
@@ -32,13 +32,15 @@ predicate calls(DataFlow::InvokeNode invk, Function f) {
  *
  * This only holds for explicitly modeled partial calls.
  */
-private predicate partiallyCalls(DataFlow::AdditionalPartialInvokeNode invk, DataFlow::AnalyzedNode callback, Function f) {
+private predicate partiallyCalls(
+  DataFlow::AdditionalPartialInvokeNode invk, DataFlow::AnalyzedNode callback, Function f
+) {
   invk.isPartialArgument(callback, _, _) and
-  exists (AbstractFunction callee | callee = callback.getAValue() |
-    if callback.getAValue().isIndefinite("global") then
-      (f = callee.getFunction() and f.getFile() = invk.getFile())
-    else
-      f = callee.getFunction()
+  exists(AbstractFunction callee | callee = callback.getAValue() |
+    if callback.getAValue().isIndefinite("global")
+    then (
+      f = callee.getFunction() and f.getFile() = invk.getFile()
+    ) else f = callee.getFunction()
   )
 }
 
@@ -65,14 +67,15 @@ predicate returnExpr(Function f, DataFlow::Node source, DataFlow::Node sink) {
  * additional steps from the configuration into account.
  */
 pragma[inline]
-predicate localFlowStep(DataFlow::Node pred, DataFlow::Node succ,
-                        DataFlow::Configuration configuration,
-                        FlowLabel predlbl, FlowLabel succlbl) {
+predicate localFlowStep(
+  DataFlow::Node pred, DataFlow::Node succ, DataFlow::Configuration configuration,
+  FlowLabel predlbl, FlowLabel succlbl
+) {
   pred = succ.getAPredecessor() and predlbl = succlbl
   or
   any(DataFlow::AdditionalFlowStep afs).step(pred, succ) and predlbl = succlbl
   or
-  exists (boolean vp | configuration.isAdditionalFlowStep(pred, succ, vp) |
+  exists(boolean vp | configuration.isAdditionalFlowStep(pred, succ, vp) |
     vp = true and
     predlbl = succlbl
     or
@@ -88,26 +91,30 @@ predicate localFlowStep(DataFlow::Node pred, DataFlow::Node succ,
  * Holds if `arg` is passed as an argument into parameter `parm`
  * through invocation `invk` of function `f`.
  */
-predicate argumentPassing(DataFlow::InvokeNode invk, DataFlow::ValueNode arg, Function f, Parameter parm) {
+predicate argumentPassing(
+  DataFlow::InvokeNode invk, DataFlow::ValueNode arg, Function f, Parameter parm
+) {
   calls(invk, f) and
-  exists (int i |
-    f.getParameter(i) = parm and not parm.isRestParameter() and
+  exists(int i |
+    f.getParameter(i) = parm and
+    not parm.isRestParameter() and
     arg = invk.getArgument(i)
   )
   or
-  exists (DataFlow::Node callback, int i |
+  exists(DataFlow::Node callback, int i |
     invk.(DataFlow::AdditionalPartialInvokeNode).isPartialArgument(callback, arg, i) and
     partiallyCalls(invk, callback, f) and
-    parm = f.getParameter(i) and not parm.isRestParameter())
+    parm = f.getParameter(i) and
+    not parm.isRestParameter()
+  )
 }
 
-
 /**
  * Holds if there is a flow step from `pred` to `succ` through parameter passing
  * to a function call.
  */
 predicate callStep(DataFlow::Node pred, DataFlow::Node succ) {
-  exists (Parameter parm |
+  exists(Parameter parm |
     argumentPassing(_, pred, _, parm) and
     succ = DataFlow::parameterNode(parm)
   )
@@ -118,7 +125,7 @@ predicate callStep(DataFlow::Node pred, DataFlow::Node succ) {
  * from a function call.
  */
 predicate returnStep(DataFlow::Node pred, DataFlow::Node succ) {
-  exists (Function f |
+  exists(Function f |
     returnExpr(f, pred, _) and
     calls(succ, f)
   )
@@ -130,7 +137,7 @@ predicate returnStep(DataFlow::Node pred, DataFlow::Node succ) {
  */
 pragma[noinline]
 private predicate trackedPropertyWrite(AbstractValue obj, string prop, DataFlow::Node rhs) {
-  exists (AnalyzedPropertyWrite pw |
+  exists(AnalyzedPropertyWrite pw |
     pw.writes(obj, prop, rhs) and
     shouldTrackProperties(obj) and
     // avoid introducing spurious global flow
@@ -142,7 +149,7 @@ private predicate trackedPropertyWrite(AbstractValue obj, string prop, DataFlow:
  * Holds if there is a flow step from `pred` to `succ` through an object property.
  */
 predicate propertyFlowStep(DataFlow::Node pred, DataFlow::Node succ) {
-  exists (AbstractValue obj, string prop |
+  exists(AbstractValue obj, string prop |
     trackedPropertyWrite(obj, prop, pred) and
     succ.(AnalyzedPropertyRead).reads(obj, prop)
   )
@@ -153,7 +160,7 @@ predicate propertyFlowStep(DataFlow::Node pred, DataFlow::Node succ) {
  */
 pragma[noinline]
 private DataFlow::ValueNode getADefIn(GlobalVariable gv, File f) {
-  exists (VarDef def |
+  exists(VarDef def |
     def.getFile() = f and
     def.getTarget() = gv.getAReference() and
     result = DataFlow::valueNode(def.getSource())
@@ -174,7 +181,7 @@ DataFlow::ValueNode getAUseIn(GlobalVariable gv, File f) {
  * variable. Both `pred` and `succ` must be in the same file.
  */
 predicate globalFlowStep(DataFlow::Node pred, DataFlow::Node succ) {
-  exists (GlobalVariable gv, File f |
+  exists(GlobalVariable gv, File f |
     pred = getADefIn(gv, f) and
     succ = getAUseIn(gv, f)
   )
@@ -186,9 +193,7 @@ predicate globalFlowStep(DataFlow::Node pred, DataFlow::Node succ) {
  */
 pragma[noinline]
 predicate globalPropertyWrite(GlobalVariable gv, File f, string prop, DataFlow::Node rhs) {
-  exists (DataFlow::PropWrite pw |
-    pw.writes(getAUseIn(gv, f), prop, rhs)
-  )
+  exists(DataFlow::PropWrite pw | pw.writes(getAUseIn(gv, f), prop, rhs))
 }
 
 /**
@@ -197,7 +202,7 @@ predicate globalPropertyWrite(GlobalVariable gv, File f, string prop, DataFlow::
  */
 pragma[noinline]
 predicate globalPropertyRead(GlobalVariable gv, File f, string prop, DataFlow::Node base) {
-  exists (DataFlow::PropRead pr |
+  exists(DataFlow::PropRead pr |
     base = getAUseIn(gv, f) and
     pr.accesses(base, prop)
   )
@@ -224,7 +229,7 @@ predicate globalPropertyRead(GlobalVariable gv, File f, string prop, DataFlow::N
 predicate basicStoreStep(DataFlow::Node pred, DataFlow::Node succ, string prop) {
   succ.(DataFlow::SourceNode).hasPropertyWrite(prop, pred)
   or
-  exists (GlobalVariable gv, File f |
+  exists(GlobalVariable gv, File f |
     globalPropertyWrite(gv, f, prop, pred) and
     globalPropertyRead(gv, f, prop, succ)
   )
@@ -241,9 +246,7 @@ predicate loadStep(DataFlow::Node pred, DataFlow::PropRead succ, string prop) {
 /**
  * A utility class that is equivalent to `boolean` but does not require type joining.
  */
-class Boolean extends boolean {
-  Boolean() { this = true or this = false }
-}
+class Boolean extends boolean { Boolean() { this = true or this = false } }
 
 /**
  * A summary of an inter-procedural data flow path.
@@ -265,28 +268,23 @@ newtype TPathSummary =
  */
 class PathSummary extends TPathSummary {
   Boolean hasReturn;
+
   Boolean hasCall;
+
   FlowLabel start;
+
   FlowLabel end;
 
-  PathSummary() {
-    this = MkPathSummary(hasReturn, hasCall, start, end)
-  }
+  PathSummary() { this = MkPathSummary(hasReturn, hasCall, start, end) }
 
   /** Indicates whether the path represented by this summary contains any return steps. */
-  boolean hasReturn() {
-    result = hasReturn
-  }
+  boolean hasReturn() { result = hasReturn }
 
   /** Indicates whether the path represented by this summary contains any call steps. */
-  boolean hasCall() {
-    result = hasCall
-  }
+  boolean hasCall() { result = hasCall }
 
   /** Gets the flow label describing the value at the end of this flow path. */
-  FlowLabel getEndLabel() {
-    result = end
-  }
+  FlowLabel getEndLabel() { result = end }
 
   /**
    * Gets the summary for the path obtained by appending `that` to `this`.
@@ -295,11 +293,11 @@ class PathSummary extends TPathSummary {
    * a `call` step in order to maintain well-formedness.
    */
   PathSummary append(PathSummary that) {
-    exists (Boolean hasReturn2, Boolean hasCall2, FlowLabel end2 |
-      that = MkPathSummary(hasReturn2, hasCall2, end, end2) |
-      result = MkPathSummary(hasReturn.booleanOr(hasReturn2),
-                             hasCall.booleanOr(hasCall2),
-                             start, end2) and
+    exists(Boolean hasReturn2, Boolean hasCall2, FlowLabel end2 |
+      that = MkPathSummary(hasReturn2, hasCall2, end, end2)
+    |
+      result = MkPathSummary(hasReturn.booleanOr(hasReturn2), hasCall.booleanOr(hasCall2), start,
+          end2) and
       // avoid constructing invalid paths
       not (hasCall = true and hasReturn2 = true)
     )
@@ -311,11 +309,11 @@ class PathSummary extends TPathSummary {
    * a value-preserving path).
    */
   PathSummary appendValuePreserving(PathSummary that) {
-    exists (Boolean hasReturn2, Boolean hasCall2 |
-      that = MkPathSummary(hasReturn2, hasCall2, FlowLabel::data(), FlowLabel::data()) |
-      result = MkPathSummary(hasReturn.booleanOr(hasReturn2),
-                             hasCall.booleanOr(hasCall2),
-                             start, end) and
+    exists(Boolean hasReturn2, Boolean hasCall2 |
+      that = MkPathSummary(hasReturn2, hasCall2, FlowLabel::data(), FlowLabel::data())
+    |
+      result = MkPathSummary(hasReturn.booleanOr(hasReturn2), hasCall.booleanOr(hasCall2), start,
+          end) and
       // avoid constructing invalid paths
       not (hasCall = true and hasReturn2 = true)
     )
@@ -324,17 +322,16 @@ class PathSummary extends TPathSummary {
   /**
    * Gets the summary for the path obtained by appending `this` to `that`.
    */
-  PathSummary prepend(PathSummary that) {
-    result = that.append(this)
-  }
+  PathSummary prepend(PathSummary that) { result = that.append(this) }
 
   /** Gets a textual representation of this path summary. */
   string toString() {
-    exists (string withReturn, string withCall |
+    exists(string withReturn, string withCall |
       (if hasReturn = true then withReturn = "with" else withReturn = "without") and
-      (if hasCall = true then withCall = "with" else withCall = "without") |
+      (if hasCall = true then withCall = "with" else withCall = "without")
+    |
       result = "path " + withReturn + " return steps and " + withCall + " call steps " +
-               "transforming " + start + " into " + end
+          "transforming " + start + " into " + end
     )
   }
 }
@@ -343,27 +340,15 @@ module PathSummary {
   /**
    * Gets a summary describing a path without any calls or returns.
    */
-  PathSummary level() {
-    exists (FlowLabel lbl |
-      result = MkPathSummary(false, false, lbl, lbl)
-    )
-  }
+  PathSummary level() { exists(FlowLabel lbl | result = MkPathSummary(false, false, lbl, lbl)) }
 
   /**
    * Gets a summary describing a path with one or more calls, but no returns.
    */
-  PathSummary call() {
-    exists (FlowLabel lbl |
-      result = MkPathSummary(false, true, lbl, lbl)
-    )
-  }
+  PathSummary call() { exists(FlowLabel lbl | result = MkPathSummary(false, true, lbl, lbl)) }
 
   /**
    * Gets a summary describing a path with one or more returns, but no calls.
    */
-  PathSummary return() {
-    exists (FlowLabel lbl |
-      result = MkPathSummary(true, false, lbl, lbl)
-    )
-  }
+  PathSummary return() { exists(FlowLabel lbl | result = MkPathSummary(true, false, lbl, lbl)) }
 }
diff --git a/javascript/ql/src/semmle/javascript/dataflow/internal/InterModuleTypeInference.qll b/javascript/ql/src/semmle/javascript/dataflow/internal/InterModuleTypeInference.qll
index 10337c02b059..7f8a2325ee26 100644
--- a/javascript/ql/src/semmle/javascript/dataflow/internal/InterModuleTypeInference.qll
+++ b/javascript/ql/src/semmle/javascript/dataflow/internal/InterModuleTypeInference.qll
@@ -15,13 +15,9 @@ private import AbstractPropertiesImpl
 private class AnalyzedImportSpecifier extends AnalyzedVarDef, @importspecifier {
   ImportDeclaration id;
 
-  AnalyzedImportSpecifier() {
-    this = id.getASpecifier() and exists(id.resolveImportedPath())
-  }
+  AnalyzedImportSpecifier() { this = id.getASpecifier() and exists(id.resolveImportedPath()) }
 
-  override DataFlow::AnalyzedNode getRhs() {
-    result.(AnalyzedImport).getImportSpecifier() = this
-  }
+  override DataFlow::AnalyzedNode getRhs() { result.(AnalyzedImport).getImportSpecifier() = this }
 
   override predicate isIncomplete(DataFlow::Incompleteness cause) {
     // mark as incomplete if the import could rely on the lookup path
@@ -29,7 +25,7 @@ private class AnalyzedImportSpecifier extends AnalyzedVarDef, @importspecifier {
     cause = "import"
     or
     // mark as incomplete if we cannot fully analyze this import
-    exists (Module m | m = id.resolveImportedPath() |
+    exists(Module m | m = id.resolveImportedPath() |
       mayDynamicallyComputeExports(m)
       or
       incompleteExport(m, this.(ImportSpecifier).getImportedName())
@@ -44,9 +40,7 @@ private class AnalyzedImportSpecifier extends AnalyzedVarDef, @importspecifier {
  */
 bindingset[path]
 private predicate mayDependOnLookupPath(string path) {
-  exists (string firstChar | firstChar = path.charAt(0) |
-    firstChar != "." and firstChar != "/"
-  )
+  exists(string firstChar | firstChar = path.charAt(0) | firstChar != "." and firstChar != "/")
 }
 
 /**
@@ -55,7 +49,7 @@ private predicate mayDependOnLookupPath(string path) {
 private predicate mayDynamicallyComputeExports(Module m) {
   // if `m` accesses its `module` or `exports` variable, we conservatively assume the worst;
   // in particular, this makes all imports from CommonJS modules indefinite
-  exists (Variable v, VarAccess va | v.getName() = "module" or v.getName() = "exports" |
+  exists(Variable v, VarAccess va | v.getName() = "module" or v.getName() = "exports" |
     va = v.getAnAccess() and
     (
       v = m.getScope().getAVariable()
@@ -70,7 +64,7 @@ private predicate mayDynamicallyComputeExports(Module m) {
   m instanceof AMDModule
   or
   // `m` re-exports all exports of some other module that dynamically computes its exports
-  exists (BulkReExportDeclaration rexp | rexp = m.(ES2015Module).getAnExport() |
+  exists(BulkReExportDeclaration rexp | rexp = m.(ES2015Module).getAnExport() |
     mayDynamicallyComputeExports(rexp.getImportedModule())
   )
 }
@@ -79,12 +73,12 @@ private predicate mayDynamicallyComputeExports(Module m) {
  * Holds if `x` is imported from `m`, possibly through a chain of re-exports.
  */
 private predicate relevantExport(ES2015Module m, string x) {
-  exists (ImportDeclaration id |
+  exists(ImportDeclaration id |
     id.getImportedModule() = m and
     x = id.getASpecifier().getImportedName()
   )
   or
-  exists (ReExportDeclaration rexp, string y |
+  exists(ReExportDeclaration rexp, string y |
     rexp.getImportedModule() = m and
     reExportsAs(rexp, x, y)
   )
@@ -96,13 +90,13 @@ private predicate relevantExport(ES2015Module m, string x) {
 private predicate reExportsAs(ReExportDeclaration rexp, string x, string y) {
   relevantExport(rexp.getEnclosingModule(), y) and
   (
-   exists (ExportSpecifier spec | spec = rexp.(SelectiveReExportDeclaration).getASpecifier() |
-     x = spec.getLocalName() and
-     y = spec.getExportedName()
-   )
-   or
-   rexp instanceof BulkReExportDeclaration and
-   x = y
+    exists(ExportSpecifier spec | spec = rexp.(SelectiveReExportDeclaration).getASpecifier() |
+      x = spec.getLocalName() and
+      y = spec.getExportedName()
+    )
+    or
+    rexp instanceof BulkReExportDeclaration and
+    x = y
   )
 }
 
@@ -110,15 +104,15 @@ private predicate reExportsAs(ReExportDeclaration rexp, string x, string y) {
  * Holds if `m` re-exports `y`, but we cannot fully analyze this export.
  */
 private predicate incompleteExport(ES2015Module m, string y) {
-  exists (ReExportDeclaration rexp | rexp = m.getAnExport() |
-    exists (string x | reExportsAs(rexp, x, y) |
+  exists(ReExportDeclaration rexp | rexp = m.getAnExport() |
+    exists(string x | reExportsAs(rexp, x, y) |
       // path resolution could rely on lookup path
       mayDependOnLookupPath(rexp.getImportedPath().getStringValue())
       or
       // unresolvable path
       not exists(rexp.getImportedModule())
       or
-      exists (Module n | n = rexp.getImportedModule() |
+      exists(Module n | n = rexp.getImportedModule() |
         // re-export from CommonJS/AMD
         mayDynamicallyComputeExports(n)
         or
@@ -128,7 +122,7 @@ private predicate incompleteExport(ES2015Module m, string y) {
     )
     or
     // namespace re-export
-    exists (ExportNamespaceSpecifier ns |
+    exists(ExportNamespaceSpecifier ns |
       ns.getExportDeclaration() = rexp and
       ns.getExportedName() = y
     )
@@ -143,20 +137,19 @@ private class AnalyzedImport extends AnalyzedPropertyRead, DataFlow::ValueNode {
   Module imported;
 
   AnalyzedImport() {
-    exists (ImportDeclaration id |
+    exists(ImportDeclaration id |
       astNode = id.getASpecifier() and
       imported = id.getImportedModule()
     )
   }
 
   /** Gets the import specifier being analyzed. */
-  ImportSpecifier getImportSpecifier() {
-    result = astNode
-  }
+  ImportSpecifier getImportSpecifier() { result = astNode }
 
   override predicate reads(AbstractValue base, string propName) {
-    exists (AbstractProperty exports |
-      exports = MkAbstractProperty(TAbstractModuleObject(imported), "exports") |
+    exists(AbstractProperty exports |
+      exports = MkAbstractProperty(TAbstractModuleObject(imported), "exports")
+    |
       base = exports.getALocalValue() and
       propName = astNode.(ImportSpecifier).getImportedName()
     )
@@ -189,9 +182,7 @@ private class AnalyzedNamespaceImport extends AnalyzedImport {
 class AnalyzedRequireCall extends AnalyzedPropertyRead, DataFlow::ValueNode {
   Module required;
 
-  AnalyzedRequireCall() {
-    required = astNode.(Require).getImportedModule()
-  }
+  AnalyzedRequireCall() { required = astNode.(Require).getImportedModule() }
 
   override predicate reads(AbstractValue base, string propName) {
     base = TAbstractModuleObject(required) and
@@ -221,9 +212,7 @@ class AnalyzedExternalModuleReference extends AnalyzedPropertyRead, DataFlow::Va
 private class AnalyzedAmdExport extends AnalyzedPropertyWrite, DataFlow::ValueNode {
   AMDModule amd;
 
-  AnalyzedAmdExport() {
-    astNode = amd.getDefine().getModuleExpr()
-  }
+  AnalyzedAmdExport() { astNode = amd.getDefine().getModuleExpr() }
 
   override predicate writes(AbstractValue baseVal, string propName, DataFlow::AnalyzedNode source) {
     baseVal = TAbstractModuleObject(amd) and
@@ -240,7 +229,7 @@ private class AnalyzedAmdImport extends AnalyzedPropertyRead, DataFlow::Node {
   Module required;
 
   AnalyzedAmdImport() {
-    exists (AMDModule amd, PathExpr dep, Parameter p |
+    exists(AMDModule amd, PathExpr dep, Parameter p |
       amd.getDefine().dependencyParameter(dep, p) and
       this = DataFlow::parameterNode(p) and
       required.getFile() = amd.resolve(dep)
@@ -259,13 +248,9 @@ private class AnalyzedAmdImport extends AnalyzedPropertyRead, DataFlow::Node {
 private class AnalyzedAmdParameter extends AnalyzedVarDef, @vardecl {
   AnalyzedAmdImport imp;
 
-  AnalyzedAmdParameter() {
-    imp = DataFlow::parameterNode(this)
-  }
+  AnalyzedAmdParameter() { imp = DataFlow::parameterNode(this) }
 
-  override AbstractValue getAnRhsValue() {
-    result = imp.getALocalValue()
-  }
+  override AbstractValue getAnRhsValue() { result = imp.getALocalValue() }
 }
 
 /**
@@ -273,11 +258,10 @@ private class AnalyzedAmdParameter extends AnalyzedVarDef, @vardecl {
  */
 private class AnalyzedValueExport extends AnalyzedPropertyWrite, DataFlow::ValueNode {
   ExportDeclaration export;
+
   string name;
 
-  AnalyzedValueExport() {
-    this = export.getSourceNode(name)
-  }
+  AnalyzedValueExport() { this = export.getSourceNode(name) }
 
   override predicate writes(AbstractValue baseVal, string propName, DataFlow::AnalyzedNode source) {
     baseVal = TAbstractExportsObject(export.getEnclosingModule()) and
@@ -291,7 +275,9 @@ private class AnalyzedValueExport extends AnalyzedPropertyWrite, DataFlow::Value
  */
 private class AnalyzedVariableExport extends AnalyzedPropertyWrite, DataFlow::ValueNode {
   ExportDeclaration export;
+
   string name;
+
   AnalyzedVarDef varDef;
 
   AnalyzedVariableExport() {
@@ -323,7 +309,7 @@ private class AnalyzedDefaultExportDeclaration extends AnalyzedValueExport {
     or
     // some (presumably historic) transpilers treat `export default foo` as `module.exports = foo`,
     // so allow that semantics, too, but only if there isn't a named export in the same module.
-    exists (Module m |
+    exists(Module m |
       super.writes(TAbstractExportsObject(m), "default", source) and
       baseVal = TAbstractModuleObject(m) and
       propName = "exports" and
@@ -338,9 +324,7 @@ private class AnalyzedDefaultExportDeclaration extends AnalyzedValueExport {
 private class AnalyzedExportAssign extends AnalyzedPropertyWrite, DataFlow::ValueNode {
   ExportAssignDeclaration exportAssign;
 
-  AnalyzedExportAssign() {
-    astNode = exportAssign.getExpression()
-  }
+  AnalyzedExportAssign() { astNode = exportAssign.getExpression() }
 
   override predicate writes(AbstractValue baseVal, string propName, DataFlow::AnalyzedNode source) {
     baseVal = TAbstractModuleObject(exportAssign.getTopLevel()) and
diff --git a/javascript/ql/src/semmle/javascript/dataflow/internal/InterProceduralTypeInference.qll b/javascript/ql/src/semmle/javascript/dataflow/internal/InterProceduralTypeInference.qll
index 15f4cddc5ad4..459cfe7c2bae 100644
--- a/javascript/ql/src/semmle/javascript/dataflow/internal/InterProceduralTypeInference.qll
+++ b/javascript/ql/src/semmle/javascript/dataflow/internal/InterProceduralTypeInference.qll
@@ -10,15 +10,12 @@ import AbstractValuesImpl
 /**
  * Flow analysis for `this` expressions inside functions.
  */
-private abstract class AnalyzedThisExpr extends DataFlow::AnalyzedNode, DataFlow::ThisNode {
+abstract private class AnalyzedThisExpr extends DataFlow::AnalyzedNode, DataFlow::ThisNode {
   DataFlow::FunctionNode binder;
 
-  AnalyzedThisExpr() {
-    binder = getBinder()
-  }
+  AnalyzedThisExpr() { binder = getBinder() }
 }
 
-
 /**
  * Flow analysis for `this` expressions that are bound with
  * `Function.prototype.bind`, `Function.prototype.call`,
@@ -28,12 +25,10 @@ private abstract class AnalyzedThisExpr extends DataFlow::AnalyzedNode, DataFlow
  * "inherited", we additionally still infer the ordinary abstract value.
  */
 private class AnalyzedThisInBoundFunction extends AnalyzedThisExpr {
-
   AnalyzedNode thisSource;
 
   AnalyzedThisInBoundFunction() {
-    exists(string name |
-      name = "bind" or name = "call" or name = "apply" |
+    exists(string name | name = "bind" or name = "call" or name = "apply" |
       thisSource = binder.getAMethodCall(name).getArgument(0)
     )
     or
@@ -47,7 +42,6 @@ private class AnalyzedThisInBoundFunction extends AnalyzedThisExpr {
     result = thisSource.getALocalValue() or
     result = AnalyzedThisExpr.super.getALocalValue()
   }
-
 }
 
 /**
@@ -60,9 +54,7 @@ private class AnalyzedThisInBoundFunction extends AnalyzedThisExpr {
 private class AnalyzedThisInConstructorFunction extends AnalyzedThisExpr {
   AbstractValue value;
 
-  AnalyzedThisInConstructorFunction() {
-    value = AbstractInstance::of(binder.getFunction())
-  }
+  AnalyzedThisInConstructorFunction() { value = AbstractInstance::of(binder.getFunction()) }
 
   override AbstractValue getALocalValue() {
     result = value or
@@ -81,7 +73,7 @@ private class AnalyzedThisInInstanceMember extends AnalyzedThisExpr {
   ClassDefinition c;
 
   AnalyzedThisInInstanceMember() {
-    exists (MemberDefinition m |
+    exists(MemberDefinition m |
       m = c.getAMember() and
       not m.isStatic() and
       binder = DataFlow::valueNode(c.getAMember().getInit())
@@ -115,7 +107,7 @@ private class AnalyzedThisInPropertyFunction extends AnalyzedThisExpr {
   DataFlow::AnalyzedNode base;
 
   AnalyzedThisInPropertyFunction() {
-    exists (DataFlow::PropWrite pwn |
+    exists(DataFlow::PropWrite pwn |
       pwn.getRhs() = binder and
       base = pwn.getBase().analyze()
     )
@@ -131,7 +123,6 @@ private class AnalyzedThisInPropertyFunction extends AnalyzedThisExpr {
  * A call with inter-procedural type inference for the return value.
  */
 abstract class CallWithAnalyzedReturnFlow extends DataFlow::AnalyzedValueNode {
-
   /**
    * Gets a called function.
    */
@@ -149,7 +140,6 @@ abstract class CallWithAnalyzedReturnFlow extends DataFlow::AnalyzedValueNode {
  * Unlike `CallWithAnalyzedReturnFlow`, this only contributes to `getAValue()`, not `getALocalValue()`.
  */
 abstract class CallWithNonLocalAnalyzedReturnFlow extends DataFlow::AnalyzedValueNode {
-
   /**
    * Gets a called function.
    */
@@ -168,17 +158,11 @@ abstract class CallWithNonLocalAnalyzedReturnFlow extends DataFlow::AnalyzedValu
  * Flow analysis for the return value of IIFEs.
  */
 private class IIFEWithAnalyzedReturnFlow extends CallWithAnalyzedReturnFlow {
-  
   ImmediatelyInvokedFunctionExpr iife;
-  
-  IIFEWithAnalyzedReturnFlow() {
-    astNode = iife.getInvocation()
-  }
-  
-  override AnalyzedFunction getACallee() {
-    result = iife.analyze()
-  }
-  
+
+  IIFEWithAnalyzedReturnFlow() { astNode = iife.getInvocation() }
+
+  override AnalyzedFunction getACallee() { result = iife.analyze() }
 }
 
 /**
@@ -195,11 +179,10 @@ private VarAccess getOnlyAccess(FunctionDeclStmt fn, LocalVariable v) {
 
 /** A function that only is used locally, making it amenable to type inference. */
 class LocalFunction extends Function {
-
   DataFlow::Impl::ExplicitInvokeNode invk;
 
   LocalFunction() {
-    exists (LocalVariable v |
+    exists(LocalVariable v |
       getOnlyAccess(this, v) = invk.getCalleeNode().asExpr() and
       not exists(v.getAnAssignedExpr()) and
       not exists(ExportDeclaration export | export.exportsAs(v, _))
@@ -210,31 +193,24 @@ class LocalFunction extends Function {
   }
 
   /** Gets an invocation of this function. */
-  DataFlow::InvokeNode getAnInvocation() {
-    result = invk
-  }
-
+  DataFlow::InvokeNode getAnInvocation() { result = invk }
 }
 
 /**
  * Enables inter-procedural type inference for a call to a `LocalFunction`.
  */
 private class LocalFunctionCallWithAnalyzedReturnFlow extends CallWithAnalyzedReturnFlow {
-
   LocalFunction f;
 
-  LocalFunctionCallWithAnalyzedReturnFlow() {
-    this = f.getAnInvocation()
-  }
-
-  override AnalyzedFunction getACallee() {
-    result = f.analyze()
-  }
+  LocalFunctionCallWithAnalyzedReturnFlow() { this = f.getAnInvocation() }
 
+  override AnalyzedFunction getACallee() { result = f.analyze() }
 }
 
 pragma[noinline]
-private predicate hasExplicitDefiniteCallee(DataFlow::Impl::ExplicitCallNode call, DataFlow::AnalyzedNode callee) {
+private predicate hasExplicitDefiniteCallee(
+  DataFlow::Impl::ExplicitCallNode call, DataFlow::AnalyzedNode callee
+) {
   callee = call.getCalleeNode() and
   not callee.getALocalValue().isIndefinite(_)
 }
@@ -243,18 +219,14 @@ private predicate hasExplicitDefiniteCallee(DataFlow::Impl::ExplicitCallNode cal
  * Enables inter-procedural type inference for the return value of a call to a type-inferred callee.
  */
 private class TypeInferredCalleeWithAnalyzedReturnFlow extends CallWithNonLocalAnalyzedReturnFlow {
-
   DataFlow::FunctionNode fun;
 
   TypeInferredCalleeWithAnalyzedReturnFlow() {
-    exists (DataFlow::AnalyzedNode calleeNode |
+    exists(DataFlow::AnalyzedNode calleeNode |
       hasExplicitDefiniteCallee(this, calleeNode) and
       calleeNode.getALocalValue().(AbstractFunction).getFunction().flow() = fun
     )
   }
 
-  override AnalyzedFunction getACallee() {
-    result = fun
-  }
-
+  override AnalyzedFunction getACallee() { result = fun }
 }
diff --git a/javascript/ql/src/semmle/javascript/dataflow/internal/PropertyTypeInference.qll b/javascript/ql/src/semmle/javascript/dataflow/internal/PropertyTypeInference.qll
index c9160e4a4a71..4b82995ab5b0 100644
--- a/javascript/ql/src/semmle/javascript/dataflow/internal/PropertyTypeInference.qll
+++ b/javascript/ql/src/semmle/javascript/dataflow/internal/PropertyTypeInference.qll
@@ -37,16 +37,15 @@ abstract class AnalyzedPropertyRead extends DataFlow::AnalyzedNode {
    */
   pragma[noinline]
   private AbstractProperty getASourceProperty() {
-    exists (AbstractValue base, string prop | reads(base, prop) |
+    exists(AbstractValue base, string prop | reads(base, prop) |
       result = MkAbstractProperty(base, prop)
     )
   }
 
   override predicate isIncomplete(DataFlow::Incompleteness cause) {
-    super.isIncomplete(cause) or
-    exists (AbstractValue base | reads(base, _) |
-      base.isIndefinite(cause)
-    )
+    super.isIncomplete(cause)
+    or
+    exists(AbstractValue base | reads(base, _) | base.isIndefinite(cause))
   }
 }
 
@@ -55,7 +54,9 @@ abstract class AnalyzedPropertyRead extends DataFlow::AnalyzedNode {
  */
 private class AnalyzedPropertyAccess extends AnalyzedPropertyRead, DataFlow::ValueNode {
   override PropAccess astNode;
+
   DataFlow::AnalyzedNode baseNode;
+
   string propName;
 
   AnalyzedPropertyAccess() {
@@ -74,7 +75,7 @@ private class AnalyzedPropertyAccess extends AnalyzedPropertyRead, DataFlow::Val
  * Holds if `prop` is a property name that does not look like an array index.
  */
 private predicate isNonNumericPropertyName(string prop) {
-  exists (PropAccess pacc |
+  exists(PropAccess pacc |
     prop = pacc.getPropertyName() and
     not exists(prop.toInt())
   )
@@ -84,9 +85,7 @@ private predicate isNonNumericPropertyName(string prop) {
  * Holds if properties named `prop` should be tracked.
  */
 pragma[noinline]
-private predicate isTrackedPropertyName(string prop) {
-  exists (MkAbstractProperty(_, prop))
-}
+private predicate isTrackedPropertyName(string prop) { exists(MkAbstractProperty(_, prop)) }
 
 /**
  * Flow analysis for property writes, including exports (which are
@@ -100,16 +99,14 @@ abstract class AnalyzedPropertyWrite extends DataFlow::Node {
    * Note that not all property writes have an explicit `source` node; use predicate
    * `writesValue` below to cover these cases.
    */
-  predicate writes(AbstractValue baseVal, string propName, DataFlow::AnalyzedNode source) {
-    none()
-  }
+  predicate writes(AbstractValue baseVal, string propName, DataFlow::AnalyzedNode source) { none() }
 
   /**
    * Holds if this property write assigns `val` to property `propName` of one of the
    * concrete objects represented by `baseVal`.
    */
   predicate writesValue(AbstractValue baseVal, string propName, AbstractValue val) {
-    exists (AnalyzedNode source |
+    exists(AnalyzedNode source |
       writes(baseVal, propName, source) and
       val = source.getALocalValue()
     )
@@ -126,9 +123,7 @@ abstract class AnalyzedPropertyWrite extends DataFlow::Node {
  * Flow analysis for property writes.
  */
 private class AnalyzedExplicitPropertyWrite extends AnalyzedPropertyWrite {
-  AnalyzedExplicitPropertyWrite() {
-    this instanceof DataFlow::PropWrite
-  }
+  AnalyzedExplicitPropertyWrite() { this instanceof DataFlow::PropWrite }
 
   override predicate writes(AbstractValue base, string prop, DataFlow::AnalyzedNode source) {
     explicitPropertyWrite(this, base, prop, source)
@@ -140,26 +135,26 @@ private class AnalyzedExplicitPropertyWrite extends AnalyzedPropertyWrite {
 }
 
 pragma[noopt]
-private predicate explicitPropertyWrite(DataFlow::PropWrite pw, AbstractValue base,
-                                        string prop, DataFlow::Node source) {
-  exists (DataFlow::AnalyzedNode baseNode |
+private predicate explicitPropertyWrite(
+  DataFlow::PropWrite pw, AbstractValue base, string prop, DataFlow::Node source
+) {
+  exists(DataFlow::AnalyzedNode baseNode |
     pw.writes(baseNode, prop, source) and
     isTrackedPropertyName(prop) and
     base = baseNode.getALocalValue() and
     shouldTrackProperties(base)
   )
 }
+
 /**
  * Flow analysis for `arguments.callee`. We assume it is never redefined,
  * which is unsound in practice, but pragmatically useful.
  */
 private class AnalyzedArgumentsCallee extends AnalyzedPropertyAccess {
-  AnalyzedArgumentsCallee() {
-    propName = "callee"
-  }
+  AnalyzedArgumentsCallee() { propName = "callee" }
 
   override AbstractValue getALocalValue() {
-    exists (AbstractArguments baseVal | reads(baseVal, _) |
+    exists(AbstractArguments baseVal | reads(baseVal, _) |
       result = TAbstractFunction(baseVal.getFunction())
     )
     or
@@ -173,7 +168,7 @@ private class AnalyzedArgumentsCallee extends AnalyzedPropertyAccess {
  */
 private predicate hasNonArgumentsBase(PropAccess pacc) {
   pacc.getPropertyName() = "callee" and
-  exists (AbstractValue baseVal |
+  exists(AbstractValue baseVal |
     baseVal = pacc.getBase().analyze().getALocalValue() and
     not baseVal instanceof AbstractArguments
   )
diff --git a/javascript/ql/src/semmle/javascript/dataflow/internal/VariableTypeInference.qll b/javascript/ql/src/semmle/javascript/dataflow/internal/VariableTypeInference.qll
index 8f745e105846..b939e94f1939 100644
--- a/javascript/ql/src/semmle/javascript/dataflow/internal/VariableTypeInference.qll
+++ b/javascript/ql/src/semmle/javascript/dataflow/internal/VariableTypeInference.qll
@@ -13,29 +13,21 @@ private import semmle.javascript.dataflow.Refinements
  * Flow analysis for captured variables.
  */
 private class AnalyzedCapturedVariable extends @variable {
-  AnalyzedCapturedVariable() {
-    this.(LocalVariable).isCaptured()
-  }
+  AnalyzedCapturedVariable() { this.(LocalVariable).isCaptured() }
 
   /**
    * Gets an abstract value that may be assigned to this variable.
    */
   pragma[nomagic]
-  AbstractValue getALocalValue() {
-    result = getADef().getAnAssignedValue()
-  }
+  AbstractValue getALocalValue() { result = getADef().getAnAssignedValue() }
 
   /**
    * Gets a definition of this variable.
    */
-  AnalyzedVarDef getADef() {
-    this = result.getAVariable()
-  }
+  AnalyzedVarDef getADef() { this = result.getAVariable() }
 
   /** Gets a textual representation of this element. */
-  string toString() {
-    result = this.(Variable).toString()
-  }
+  string toString() { result = this.(Variable).toString() }
 }
 
 /**
@@ -44,13 +36,9 @@ private class AnalyzedCapturedVariable extends @variable {
 private class SsaVarAccessAnalysis extends DataFlow::AnalyzedValueNode {
   AnalyzedSsaDefinition def;
 
-  SsaVarAccessAnalysis() {
-    astNode = def.getVariable().getAUse()
-  }
+  SsaVarAccessAnalysis() { astNode = def.getVariable().getAUse() }
 
-  override AbstractValue getALocalValue() {
-    result = def.getAnRhsValue()
-  }
+  override AbstractValue getALocalValue() { result = def.getAnRhsValue() }
 }
 
 /**
@@ -63,8 +51,9 @@ class AnalyzedVarDef extends VarDef {
    * cannot be analyzed completely.
    */
   AbstractValue getAnAssignedValue() {
-    result = getAnRhsValue() or
-    exists (DataFlow::Incompleteness cause |
+    result = getAnRhsValue()
+    or
+    exists(DataFlow::Incompleteness cause |
       isIncomplete(cause) and result = TIndefiniteAbstractValue(cause)
     )
   }
@@ -74,9 +63,12 @@ class AnalyzedVarDef extends VarDef {
    * may evaluate to.
    */
   AbstractValue getAnRhsValue() {
-    result = getRhs().getALocalValue() or
-    this = any(ForInStmt fis).getIteratorExpr() and result = abstractValueOfType(TTString()) or
-    this = any(EnumMember member | not exists(member.getInitializer())).getIdentifier() and result = abstractValueOfType(TTNumber())
+    result = getRhs().getALocalValue()
+    or
+    this = any(ForInStmt fis).getIteratorExpr() and result = abstractValueOfType(TTString())
+    or
+    this = any(EnumMember member | not exists(member.getInitializer())).getIdentifier() and
+    result = abstractValueOfType(TTNumber())
   }
 
   /**
@@ -84,9 +76,11 @@ class AnalyzedVarDef extends VarDef {
    * this `VarDef`.
    */
   DataFlow::AnalyzedNode getRhs() {
-    result = getSource().analyze() and getTarget() instanceof VarRef or
-    result.asExpr() = (CompoundAssignExpr)this or
-    result.asExpr() = (UpdateExpr)this
+    result = getSource().analyze() and getTarget() instanceof VarRef
+    or
+    result.asExpr() = this.(CompoundAssignExpr)
+    or
+    result.asExpr() = this.(UpdateExpr)
   }
 
   /**
@@ -94,21 +88,24 @@ class AnalyzedVarDef extends VarDef {
    * due to the given `cause`.
    */
   predicate isIncomplete(DataFlow::Incompleteness cause) {
-    this instanceof Parameter and cause = "call" or
-    this instanceof ImportSpecifier and cause = "import" or
-    exists (EnhancedForLoop efl | efl instanceof ForOfStmt or efl instanceof ForEachStmt |
+    this instanceof Parameter and cause = "call"
+    or
+    this instanceof ImportSpecifier and cause = "import"
+    or
+    exists(EnhancedForLoop efl | efl instanceof ForOfStmt or efl instanceof ForEachStmt |
       this = efl.getIteratorExpr()
-    ) and cause = "heap" or
-    exists (ComprehensionBlock cb | this = cb.getIterator()) and cause = "yield" or
+    ) and
+    cause = "heap"
+    or
+    exists(ComprehensionBlock cb | this = cb.getIterator()) and cause = "yield"
+    or
     getTarget() instanceof DestructuringPattern and cause = "heap"
   }
 
   /**
    * Gets the toplevel syntactic unit to which this definition belongs.
    */
-  TopLevel getTopLevel() {
-    result = this.(ASTNode).getTopLevel()
-  }
+  TopLevel getTopLevel() { result = this.(ASTNode).getTopLevel() }
 }
 
 /**
@@ -116,17 +113,14 @@ class AnalyzedVarDef extends VarDef {
  */
 private class AnalyzedParameter extends AnalyzedVarDef, @vardecl {
   AnalyzedParameter() {
-    exists (FunctionWithAnalyzedParameters f, int parmIdx |
-      this = f.getParameter(parmIdx) |
+    exists(FunctionWithAnalyzedParameters f, int parmIdx | this = f.getParameter(parmIdx) |
       // we cannot track flow into rest parameters
       not this.(Parameter).isRestParameter()
     )
   }
 
   /** Gets the function this is a parameter of. */
-  FunctionWithAnalyzedParameters getFunction() {
-    this = result.getAParameter()
-  }
+  FunctionWithAnalyzedParameters getFunction() { this = result.getAParameter() }
 
   override DataFlow::AnalyzedNode getRhs() {
     getFunction().argumentPassing(this, result.asExpr()) or
@@ -141,31 +135,25 @@ private class AnalyzedParameter extends AnalyzedVarDef, @vardecl {
   }
 
   override predicate isIncomplete(DataFlow::Incompleteness cause) {
-    getFunction().isIncomplete(cause) or
+    getFunction().isIncomplete(cause)
+    or
     (
       not getFunction().argumentPassing(this, _) and
       getFunction().mayReceiveArgument(this) and
       cause = "call"
     )
   }
-  
 }
 
 /**
  * Flow analysis for simple rest parameters.
  */
 private class AnalyzedRestParameter extends AnalyzedVarDef, @vardecl {
-  AnalyzedRestParameter() {
-    this.(Parameter).isRestParameter()
-  }
+  AnalyzedRestParameter() { this.(Parameter).isRestParameter() }
 
-  override AbstractValue getAnRhsValue() {
-    result = TAbstractOtherObject()
-  }
+  override AbstractValue getAnRhsValue() { result = TAbstractOtherObject() }
 
-  override predicate isIncomplete(DataFlow::Incompleteness cause) {
-    none()
-  }
+  override predicate isIncomplete(DataFlow::Incompleteness cause) { none() }
 }
 
 /**
@@ -175,7 +163,7 @@ private class AnalyzedAmdParameter extends AnalyzedVarDef {
   AbstractValue implicitInitVal;
 
   AnalyzedAmdParameter() {
-    exists (AMDModule m, AMDModuleDefinition mdef | mdef = m.getDefine() |
+    exists(AMDModule m, AMDModuleDefinition mdef | mdef = m.getDefine() |
       this = mdef.getModuleParameter() and
       implicitInitVal = TAbstractModuleObject(m)
       or
@@ -205,18 +193,14 @@ abstract class AnalyzedSsaDefinition extends SsaDefinition {
  * Flow analysis for SSA definitions corresponding to `VarDef`s.
  */
 private class AnalyzedExplicitDefinition extends AnalyzedSsaDefinition, SsaExplicitDefinition {
-  override AbstractValue getAnRhsValue() {
-    result = getDef().(AnalyzedVarDef).getAnAssignedValue()
-  }
+  override AbstractValue getAnRhsValue() { result = getDef().(AnalyzedVarDef).getAnAssignedValue() }
 }
 
 /**
  * Flow analysis for SSA definitions corresponding to implicit variable initialization.
  */
 private class AnalyzedImplicitInit extends AnalyzedSsaDefinition, SsaImplicitInit {
-  override AbstractValue getAnRhsValue() {
-    result = getImplicitInitValue(getSourceVariable())
-  }
+  override AbstractValue getAnRhsValue() { result = getImplicitInitValue(getSourceVariable()) }
 }
 
 /**
@@ -224,8 +208,9 @@ private class AnalyzedImplicitInit extends AnalyzedSsaDefinition, SsaImplicitIni
  */
 private class AnalyzedVariableCapture extends AnalyzedSsaDefinition, SsaVariableCapture {
   override AbstractValue getAnRhsValue() {
-    exists (LocalVariable v | v = getSourceVariable() |
-      result = v.(AnalyzedCapturedVariable).getALocalValue() or
+    exists(LocalVariable v | v = getSourceVariable() |
+      result = v.(AnalyzedCapturedVariable).getALocalValue()
+      or
       not guaranteedToBeInitialized(v) and result = getImplicitInitValue(v)
     )
   }
@@ -264,12 +249,10 @@ class AnalyzedRefinement extends AnalyzedSsaDefinition, SsaRefinementNode {
  * into sets of more precise abstract values to enable them to be refined.
  */
 class AnalyzedConditionGuard extends AnalyzedRefinement {
-  AnalyzedConditionGuard() {
-    getGuard() instanceof ConditionGuardNode
-  }
+  AnalyzedConditionGuard() { getGuard() instanceof ConditionGuardNode }
 
   override AbstractValue getAnInputRhsValue() {
-    exists (AbstractValue input | input = super.getAnInputRhsValue() |
+    exists(AbstractValue input | input = super.getAnInputRhsValue() |
       result = input.(IndefiniteAbstractValue).split()
       or
       not input instanceof IndefiniteAbstractValue and result = input
@@ -284,13 +267,11 @@ class AnalyzedConditionGuard extends AnalyzedRefinement {
  * the beginning of `s` to those that are truthy.
  */
 class AnalyzedPositiveConditionGuard extends AnalyzedRefinement {
-  AnalyzedPositiveConditionGuard() {
-    getGuard().(ConditionGuardNode).getOutcome() = true
-  }
+  AnalyzedPositiveConditionGuard() { getGuard().(ConditionGuardNode).getOutcome() = true }
 
   override AbstractValue getAnRhsValue() {
     result = getAnInputRhsValue() and
-    exists (RefinementContext ctxt |
+    exists(RefinementContext ctxt |
       ctxt = TVarRefinementContext(this, getSourceVariable(), result) and
       getRefinement().eval(ctxt).getABooleanValue() = true
     )
@@ -304,13 +285,11 @@ class AnalyzedPositiveConditionGuard extends AnalyzedRefinement {
  * the beginning of `t` to those that are falsy.
  */
 class AnalyzedNegativeConditionGuard extends AnalyzedRefinement {
-  AnalyzedNegativeConditionGuard() {
-    getGuard().(ConditionGuardNode).getOutcome() = false
-  }
+  AnalyzedNegativeConditionGuard() { getGuard().(ConditionGuardNode).getOutcome() = false }
 
   override AbstractValue getAnRhsValue() {
     result = getAnInputRhsValue() and
-    exists (RefinementContext ctxt |
+    exists(RefinementContext ctxt |
       ctxt = TVarRefinementContext(this, getSourceVariable(), result) and
       getRefinement().eval(ctxt).getABooleanValue() = false
     )
@@ -325,25 +304,23 @@ class AnalyzedNegativeConditionGuard extends AnalyzedRefinement {
  * and special Node.js variables such as `module` and `exports`.
  */
 private AbstractValue getImplicitInitValue(LocalVariable v) {
-  if v instanceof ArgumentsVariable then
-    exists (Function f | v = f.getArgumentsVariable() |
-      result = TAbstractArguments(f)
-    )
-  else if nodeBuiltins(v, _) then
-    nodeBuiltins(v, result)
-  else if exists (getAFunDecl(v)) then
-    // model hoisting
-    result = TAbstractFunction(getAFunDecl(v))
+  if v instanceof ArgumentsVariable
+  then exists(Function f | v = f.getArgumentsVariable() | result = TAbstractArguments(f))
   else
-    result = TAbstractUndefined()
+    if nodeBuiltins(v, _)
+    then nodeBuiltins(v, result)
+    else
+      if exists(getAFunDecl(v))
+      then
+        // model hoisting
+        result = TAbstractFunction(getAFunDecl(v))
+      else result = TAbstractUndefined()
 }
 
 /**
  * Gets a function declaration that declares `v`.
  */
-private FunctionDeclStmt getAFunDecl(LocalVariable v) {
-  v = result.getVariable()
-}
+private FunctionDeclStmt getAFunDecl(LocalVariable v) { v = result.getVariable() }
 
 /**
  * Holds if `v` is a local variable that can never be observed in its uninitialized state.
@@ -351,14 +328,14 @@ private FunctionDeclStmt getAFunDecl(LocalVariable v) {
 pragma[noinline]
 private predicate guaranteedToBeInitialized(LocalVariable v) {
   // parameters can never be uninitialized
-  exists (Parameter p | v = p.getAVariable())
+  exists(Parameter p | v = p.getAVariable())
 }
 
 /**
  * Holds if `av` represents an initial value of CommonJS variable `var`.
  */
 private predicate nodeBuiltins(Variable var, AbstractValue av) {
-  exists (Module m, string name | var = m.getScope().getVariable(name) |
+  exists(Module m, string name | var = m.getScope().getVariable(name) |
     name = "require" and av = TIndefiniteAbstractValue("heap")
     or
     name = "module" and av = TAbstractModuleObject(m)
@@ -377,14 +354,14 @@ private predicate nodeBuiltins(Variable var, AbstractValue av) {
  */
 private class AnalyzedGlobalVarUse extends DataFlow::AnalyzedValueNode {
   GlobalVariable gv;
+
   AnalyzedGlobal agv;
 
   AnalyzedGlobalVarUse() {
-    exists (TopLevel tl | useIn(gv, astNode, tl) |
-      if exists(TAnalyzedGlocal(gv, tl)) then
-        agv = TAnalyzedGlocal(gv, tl)
-      else
-        agv = TAnalyzedGenuineGlobal(gv)
+    exists(TopLevel tl | useIn(gv, astNode, tl) |
+      if exists(TAnalyzedGlocal(gv, tl))
+      then agv = TAnalyzedGlocal(gv, tl)
+      else agv = TAnalyzedGenuineGlobal(gv)
     )
   }
 
@@ -438,7 +415,7 @@ private AnalyzedVarDef defIn(GlobalVariable gv, TopLevel tl) {
  */
 pragma[noinline]
 private predicate clobberedProp(GlobalVariable gv, DataFlow::Incompleteness reason) {
-  exists (AnalyzedNode base |
+  exists(AnalyzedNode base |
     potentialPropWriteOfGlobal(base, gv) and
     indefiniteObjectValue(base.getALocalValue(), reason)
   )
@@ -452,7 +429,7 @@ private predicate indefiniteObjectValue(AbstractValue val, DataFlow::Incompleten
 
 pragma[noinline]
 private predicate potentialPropWriteOfGlobal(AnalyzedNode base, GlobalVariable gv) {
-  exists (DataFlow::PropWrite pwn |
+  exists(DataFlow::PropWrite pwn |
     pwn.getPropertyName() = gv.getName() and
     base = pwn.getBase().analyze()
   )
@@ -474,22 +451,18 @@ private predicate potentialPropWriteOfGlobal(AnalyzedNode base, GlobalVariable g
  * abstract values of a glocal are derived purely from definitions within the same toplevel,
  * while genuine globals may get their values from anywhere in the program.
  */
-private
-newtype TAnalyzedGlobal =
+private newtype TAnalyzedGlobal =
   /**
    * A global variable in the context of a particular toplevel in which it is both used
    * and defined.
    */
-  TAnalyzedGlocal(GlobalVariable gv, TopLevel tl) {
-    useIn(gv, _, tl) and exists(defIn(gv, tl))
-  }
-  or
+  TAnalyzedGlocal(GlobalVariable gv, TopLevel tl) { useIn(gv, _, tl) and exists(defIn(gv, tl)) } or
   /**
    * A global variable that is used in at least one toplevel where it is not defined, and
    * hence has to be modelled as a truly global variable.
    */
   TAnalyzedGenuineGlobal(GlobalVariable gv) {
-    exists (TopLevel tl |
+    exists(TopLevel tl |
       useIn(gv, _, tl) and
       not exists(defIn(gv, tl))
     )
@@ -525,13 +498,12 @@ private class AnalyzedGlobal extends TAnalyzedGlobal {
  */
 private class AnalyzedGlocal extends AnalyzedGlobal, TAnalyzedGlocal {
   GlobalVariable gv;
+
   TopLevel tl;
 
   AnalyzedGlocal() { this = TAnalyzedGlocal(gv, tl) }
 
-  override AbstractValue getAnAssignedValue() {
-    result = defIn(gv, tl).getAnAssignedValue()
-  }
+  override AbstractValue getAnAssignedValue() { result = defIn(gv, tl).getAnAssignedValue() }
 
   override string toString() { result = gv + " in " + tl }
 }
@@ -542,11 +514,10 @@ private class AnalyzedGlocal extends AnalyzedGlobal, TAnalyzedGlocal {
  */
 private class AnalyzedGenuineGlobal extends AnalyzedGlobal, TAnalyzedGenuineGlobal {
   GlobalVariable gv;
+
   AnalyzedGenuineGlobal() { this = TAnalyzedGenuineGlobal(gv) }
 
-  override AbstractValue getAnAssignedValue() {
-    result = defIn(gv, _).getAnAssignedValue()
-  }
+  override AbstractValue getAnAssignedValue() { result = defIn(gv, _).getAnAssignedValue() }
 
   override string toString() { result = gv.toString() }
 }
@@ -590,18 +561,20 @@ private class AnalyzedUndefinedUse extends AnalyzedGlobalVarUse {
  * In both cases `x` is assigned through the `arguments` object.
  */
 private predicate maybeModifiedThroughArguments(LocalVariable v) {
-  exists (Function f, ArgumentsVariable args |
+  exists(Function f, ArgumentsVariable args |
     v = f.getAParameter().(SimpleParameter).getVariable() and
-    f.hasMappedArgumentsVariable() and args = f.getArgumentsVariable() |
-    exists (VarAccess acc | acc = args.getAnAccess() |
+    f.hasMappedArgumentsVariable() and
+    args = f.getArgumentsVariable()
+  |
+    exists(VarAccess acc | acc = args.getAnAccess() |
       // `acc` is a use of `arguments` that isn't a property access
       // (like `arguments[0]` or `arguments.length`), so we conservatively
       // consider `arguments` to have escaped
-      not exists (PropAccess pacc | acc = pacc.getBase())
+      not exists(PropAccess pacc | acc = pacc.getBase())
       or
       // acc is a write to a property of `arguments` other than `length`,
       // so we conservatively consider it a possible write to `v`
-      exists (PropAccess pacc | acc = pacc.getBase() |
+      exists(PropAccess pacc | acc = pacc.getBase() |
         not pacc.getPropertyName() = "length" and
         pacc instanceof LValue
       )
@@ -621,7 +594,7 @@ private predicate maybeModifiedThroughArguments(LocalVariable v) {
  */
 private class ReflectiveVarFlow extends DataFlow::AnalyzedValueNode {
   ReflectiveVarFlow() {
-    exists (Variable v | v = astNode.(VarAccess).getVariable() |
+    exists(Variable v | v = astNode.(VarAccess).getVariable() |
       any(DirectEval de).mayAffect(v)
       or
       maybeModifiedThroughArguments(v)
@@ -640,9 +613,7 @@ private class ReflectiveVarFlow extends DataFlow::AnalyzedValueNode {
  * can thus be mutated indirectly through the heap.
  */
 private class NamespaceExportVarFlow extends DataFlow::AnalyzedValueNode {
-  NamespaceExportVarFlow() {
-    astNode.(VarAccess).getVariable().isNamespaceExport()
-  }
+  NamespaceExportVarFlow() { astNode.(VarAccess).getVariable().isNamespaceExport() }
 
   override AbstractValue getALocalValue() { result = TIndefiniteAbstractValue("namespace") }
 }
@@ -651,7 +622,6 @@ private class NamespaceExportVarFlow extends DataFlow::AnalyzedValueNode {
  * A function with inter-procedural type inference for its parameters.
  */
 abstract class FunctionWithAnalyzedParameters extends Function {
-
   /**
    * Holds if `p` is a parameter of this function and `arg` is
    * the corresponding argument.
@@ -668,41 +638,38 @@ abstract class FunctionWithAnalyzedParameters extends Function {
    * due to the given `cause`.
    */
   abstract predicate isIncomplete(DataFlow::Incompleteness cause);
-
 }
 
-private abstract class CallWithAnalyzedParameters extends FunctionWithAnalyzedParameters {
-
+abstract private class CallWithAnalyzedParameters extends FunctionWithAnalyzedParameters {
   /**
    * Gets an invocation of this function.
    */
   abstract DataFlow::InvokeNode getAnInvocation();
 
   override predicate argumentPassing(SimpleParameter p, Expr arg) {
-    exists (DataFlow::InvokeNode invk, int argIdx |
-      invk = getAnInvocation() |
-      p = getParameter(argIdx) and not p.isRestParameter() and
+    exists(DataFlow::InvokeNode invk, int argIdx | invk = getAnInvocation() |
+      p = getParameter(argIdx) and
+      not p.isRestParameter() and
       arg = invk.getArgument(argIdx).asExpr()
     )
   }
 
   override predicate mayReceiveArgument(Parameter p) {
-    exists (DataFlow::InvokeNode invk, int argIdx |
+    exists(DataFlow::InvokeNode invk, int argIdx |
       invk = getAnInvocation() and
-      p = getParameter(argIdx) |
-      exists (invk.getArgument(argIdx))
+      p = getParameter(argIdx)
+    |
+      exists(invk.getArgument(argIdx))
       or
-      invk.asExpr().(InvokeExpr).isSpreadArgument([0..argIdx])
+      invk.asExpr().(InvokeExpr).isSpreadArgument([0 .. argIdx])
     )
   }
-
 }
 
 /**
  * Flow analysis for simple parameters of IIFEs.
  */
 private class IIFEWithAnalyzedParameters extends CallWithAnalyzedParameters {
-
   ImmediatelyInvokedFunctionExpr iife;
 
   IIFEWithAnalyzedParameters() {
@@ -710,39 +677,30 @@ private class IIFEWithAnalyzedParameters extends CallWithAnalyzedParameters {
     iife.getInvocationKind() = "direct"
   }
 
-  override DataFlow::InvokeNode getAnInvocation() {
-    result = iife.getInvocation().flow()
-  }
+  override DataFlow::InvokeNode getAnInvocation() { result = iife.getInvocation().flow() }
 
   override predicate isIncomplete(DataFlow::Incompleteness cause) {
     // if the IIFE has a name and that name is referenced, we conservatively
     // assume that there may be other calls than the direct one
-    exists (iife.getVariable().getAnAccess()) and cause = "call" or
+    exists(iife.getVariable().getAnAccess()) and cause = "call"
+    or
     // if the IIFE is non-strict and its `arguments` object is accessed, we
     // also assume that there may be other calls (through `arguments.callee`)
     not iife.isStrict() and
-    exists (iife.getArgumentsVariable().getAnAccess()) and cause = "call"
+    exists(iife.getArgumentsVariable().getAnAccess()) and
+    cause = "call"
   }
-
 }
 
 /**
  * Enables inter-procedural type inference for `LocalFunction`.
  */
 private class LocalFunctionWithAnalyzedParameters extends CallWithAnalyzedParameters {
-
   LocalFunction local;
 
-  LocalFunctionWithAnalyzedParameters() {
-    this = local
-  }
+  LocalFunctionWithAnalyzedParameters() { this = local }
 
-  override DataFlow::InvokeNode getAnInvocation() {
-    result = local.getAnInvocation()
-  }
-
-  override predicate isIncomplete(DataFlow::Incompleteness cause) {
-    none()
-  }
+  override DataFlow::InvokeNode getAnInvocation() { result = local.getAnInvocation() }
 
+  override predicate isIncomplete(DataFlow::Incompleteness cause) { none() }
 }
diff --git a/javascript/ql/src/semmle/javascript/dependencies/Dependencies.qll b/javascript/ql/src/semmle/javascript/dependencies/Dependencies.qll
index 1a3387728e1b..4d5fef178a21 100644
--- a/javascript/ql/src/semmle/javascript/dependencies/Dependencies.qll
+++ b/javascript/ql/src/semmle/javascript/dependencies/Dependencies.qll
@@ -51,8 +51,9 @@ abstract class NPMDependency extends Dependency {
   }
 
   override Locatable getAUse(string kind) {
-    exists (Import i | i = getAnImport() |
-      kind = "import" and result = i or
+    exists(Import i | i = getAnImport() |
+      kind = "import" and result = i
+      or
       kind = "use" and result = getATargetVariable(i).getAnAccess()
     )
   }
@@ -63,7 +64,7 @@ abstract class NPMDependency extends Dependency {
  */
 private Variable getATargetVariable(Import i) {
   // `var v = require('m')` or `var w = require('n').p`
-  exists (DataFlow::SourceNode pacc |
+  exists(DataFlow::SourceNode pacc |
     pacc = propAccessOn*(i).flow() and
     pacc.flowsToExpr(result.getAnAssignedExpr())
   )
@@ -75,9 +76,7 @@ private Variable getATargetVariable(Import i) {
 /**
  * Gets a property access of which `e` is the base.
  */
-private Expr propAccessOn(Expr e) {
-  result.(PropAccess).getBase() = e
-}
+private Expr propAccessOn(Expr e) { result.(PropAccess).getBase() = e }
 
 /**
  * A bundled NPM module, that is, a module in a package whose source is
@@ -86,29 +85,21 @@ private Expr propAccessOn(Expr e) {
  */
 class BundledNPMDependency extends NPMDependency {
   BundledNPMDependency() {
-    exists (NPMPackage pkg | this = pkg.getAModule() |
+    exists(NPMPackage pkg | this = pkg.getAModule() |
       // exclude packages marked "private": they have no globally unique ID
       not pkg.getPackageJSON().isPrivate()
     )
   }
 
   /** Gets the package to which this module belongs. */
-  private NPMPackage getPackage() {
-    this = result.getAModule()
-  }
+  private NPMPackage getPackage() { this = result.getAModule() }
 
   /** Gets the `package.json` of the package to which this module belongs. */
-  private PackageJSON getPackageJSON() {
-    result = getPackage().getPackageJSON()
-  }
+  private PackageJSON getPackageJSON() { result = getPackage().getPackageJSON() }
 
-  override string getNPMPackageName() {
-    result = getPackageJSON().getPackageName()
-  }
+  override string getNPMPackageName() { result = getPackageJSON().getPackageName() }
 
-  override string getVersion() {
-    result = getPackageJSON().getVersion()
-  }
+  override string getVersion() { result = getPackageJSON().getVersion() }
 
   override Import getAnImport() {
     this = result.getImportedModule() and
@@ -122,8 +113,8 @@ class BundledNPMDependency extends NPMDependency {
  */
 class ExternalNPMDependency extends NPMDependency {
   ExternalNPMDependency() {
-    exists (PackageJSON pkgjson |
-      (JSONString)this = pkgjson.getADependenciesObject(_).getPropValue(_)
+    exists(PackageJSON pkgjson |
+      this.(JSONString) = pkgjson.getADependenciesObject(_).getPropValue(_)
     )
   }
 
@@ -133,25 +124,25 @@ class ExternalNPMDependency extends NPMDependency {
   }
 
   override string getNPMPackageName() {
-    exists (PackageDependencies pkgdeps |
-      this = pkgdeps.getPropValue(result)
-    )
+    exists(PackageDependencies pkgdeps | this = pkgdeps.getPropValue(result))
   }
 
   override string getVersion() {
-    exists (string versionRange | versionRange = this.(JSONString).getValue() |
+    exists(string versionRange | versionRange = this.(JSONString).getValue() |
       // extract a concrete version from the version range; currently,
       // we handle exact versions as well as `<=`, `>=`, `~` and `^` ranges
-      result = versionRange.regexpCapture("(?:[><]=|[=~^])?v?(\\d+(\\.\\d+){1,2})", 1) or
+      result = versionRange.regexpCapture("(?:[><]=|[=~^])?v?(\\d+(\\.\\d+){1,2})", 1)
+      or
       // if no version is specified, report version `unknown`
-      result = "unknown" and (versionRange = "" or versionRange = "*")
+      result = "unknown" and
+      (versionRange = "" or versionRange = "*")
     )
   }
 
   override Import getAnImport() {
-    exists (int depth | depth = importsDependency(result, getDeclaringPackage(), this) |
+    exists(int depth | depth = importsDependency(result, getDeclaringPackage(), this) |
       // restrict to those results for which this is the closest matching dependency
-      depth = min (importsDependency(result, _, _))
+      depth = min(importsDependency(result, _, _))
     )
   }
 }
@@ -161,7 +152,7 @@ class ExternalNPMDependency extends NPMDependency {
  * where the result value is the nesting depth of the file containing `i` within `pkg`.
  */
 private int importsDependency(Import i, NPMPackage pkg, NPMDependency dep) {
-  exists (string name |
+  exists(string name |
     dep = pkg.getPackageJSON().getADependenciesObject(_).getPropValue(name) and
     not exists(i.getImportedModule()) and
     i.getImportedPath().getComponent(0) = name and
@@ -174,7 +165,8 @@ private int importsDependency(Import i, NPMPackage pkg, NPMDependency dep) {
  * Gets the nesting depth of `descendant` within `ancestor`.
  */
 private int distance(Folder ancestor, Container descendant) {
-  ancestor = descendant and result = 0 or
+  ancestor = descendant and result = 0
+  or
   result = 1 + distance(ancestor, descendant.getParentContainer())
 }
 
@@ -187,8 +179,7 @@ private int distance(Folder ancestor, Container descendant) {
 private predicate propAccessOnGlobal(Expr e, string n) {
   e.accessesGlobal(n)
   or
-  exists (PropAccess pacc, string q |
-    pacc = e and propAccessOnGlobal(pacc.getBase(), q) |
+  exists(PropAccess pacc, string q | pacc = e and propAccessOnGlobal(pacc.getBase(), q) |
     n = q + "." + pacc.getPropertyName()
   )
 }
@@ -203,7 +194,7 @@ abstract class ScriptDependency extends Dependency {
   abstract Expr getAnApiUse();
 
   override Locatable getAUse(string kind) {
-    kind = "import" and (HTML::HtmlFile)result = this.getFile()
+    kind = "import" and result.(HTML::HtmlFile) = this.getFile()
     or
     kind = "use" and result = getAnApiUse()
   }
@@ -215,19 +206,17 @@ abstract class ScriptDependency extends Dependency {
 class InlineScriptDependency extends ScriptDependency, @toplevel {
   FrameworkLibraryInstance fli;
 
-  InlineScriptDependency() {
-    this = fli
-  }
+  InlineScriptDependency() { this = fli }
 
   override predicate info(string id, string v) {
-    exists (FrameworkLibrary fl |
+    exists(FrameworkLibrary fl |
       fli.info(fl, v) and
       id = fl.getId()
     )
   }
 
   override Expr getAnApiUse() {
-    exists (FrameworkLibrary fl |
+    exists(FrameworkLibrary fl |
       fli.info(fl, _) and
       propAccessOnGlobal(result, fl.getAnEntryPoint()) and
       result.getFile() = this.getFile() and
@@ -243,19 +232,17 @@ class InlineScriptDependency extends ScriptDependency, @toplevel {
 class ExternalScriptDependency extends ScriptDependency, @xmlattribute {
   FrameworkLibraryReference flr;
 
-  ExternalScriptDependency() {
-    this = flr
-  }
+  ExternalScriptDependency() { this = flr }
 
   override predicate info(string id, string v) {
-    exists (FrameworkLibrary fl |
+    exists(FrameworkLibrary fl |
       flr.info(fl, v) and
       id = fl.getId()
     )
   }
 
   override Expr getAnApiUse() {
-    exists (FrameworkLibrary fl |
+    exists(FrameworkLibrary fl |
       flr.info(fl, _) and
       propAccessOnGlobal(result, fl.getAnEntryPoint()) and
       result.getFile() = this.getFile()
@@ -267,14 +254,13 @@ class ExternalScriptDependency extends ScriptDependency, @xmlattribute {
  * A dependency on GWT indicated by a GWT header script.
  */
 private class GWTDependency extends ScriptDependency {
-  GWTDependency() {
-    this instanceof GWTHeader
-  }
+  GWTDependency() { this instanceof GWTHeader }
 
   override predicate info(string id, string v) {
     id = "gwt" and
-    exists (GWTHeader h | h = this |
-      v = h.getGWTVersion() or
+    exists(GWTHeader h | h = this |
+      v = h.getGWTVersion()
+      or
       not exists(h.getGWTVersion()) and v = "unknown"
     )
   }
@@ -288,8 +274,9 @@ private class GWTDependency extends ScriptDependency {
  */
 private class GoogleClosureDep extends Dependency, @callexpr {
   GoogleClosureDep() {
-    exists (MethodCallExpr mce |
-      mce = this and mce.getReceiver().(GlobalVarAccess).getName() = "goog" |
+    exists(MethodCallExpr mce |
+      mce = this and mce.getReceiver().(GlobalVarAccess).getName() = "goog"
+    |
       mce.getMethodName() = "require" or
       mce.getMethodName() = "provide"
     )
@@ -310,9 +297,7 @@ private class GoogleClosureDep extends Dependency, @callexpr {
  * A dependency indicated by marker comment left by a code generator.
  */
 private class GeneratorComment extends Dependency, @comment {
-  GeneratorComment() {
-    generatedBy(this, _)
-  }
+  GeneratorComment() { generatedBy(this, _) }
 
   override predicate info(string id, string v) {
     generatedBy(this, id) and
@@ -329,11 +314,14 @@ private class GeneratorComment extends Dependency, @comment {
  * Holds if `c` is a marker comment left by the given `generator`.
  */
 private predicate generatedBy(Comment c, string generator) {
-  c instanceof EmscriptenMarkerComment and generator = "emscripten" or
-  exists (string gn | gn = c.(CodeGeneratorMarkerComment).getGeneratorName() |
+  c instanceof EmscriptenMarkerComment and generator = "emscripten"
+  or
+  exists(string gn | gn = c.(CodeGeneratorMarkerComment).getGeneratorName() |
     // map generator names to their npm package names
-    gn = "CoffeeScript" and generator = "coffee-script" or
-    gn = "PEG.js" and generator = "pegjs" or
+    gn = "CoffeeScript" and generator = "coffee-script"
+    or
+    gn = "PEG.js" and generator = "pegjs"
+    or
     gn != "CoffeeScript" and gn != "PEG.js" and generator = gn
   )
 }
@@ -349,9 +337,9 @@ private class BundledTopLevel extends Dependency, @expr {
 
   override predicate info(string id, string v) {
     (
-     isBrowserifyBundle(this) and id = "browserify"
-     or
-     isWebpackBundle(this) and id = "webpack"
+      isBrowserifyBundle(this) and id = "browserify"
+      or
+      isWebpackBundle(this) and id = "webpack"
     ) and
     v = "unknown"
   }
diff --git a/javascript/ql/src/semmle/javascript/dependencies/DependencyCustomizations.qll b/javascript/ql/src/semmle/javascript/dependencies/DependencyCustomizations.qll
index 8d18721af60b..8b137891791f 100644
--- a/javascript/ql/src/semmle/javascript/dependencies/DependencyCustomizations.qll
+++ b/javascript/ql/src/semmle/javascript/dependencies/DependencyCustomizations.qll
@@ -1 +1 @@
-/** Provides a place for customizations to the `Dependencies` library. */
\ No newline at end of file
+
diff --git a/javascript/ql/src/semmle/javascript/dependencies/FrameworkLibraries.qll b/javascript/ql/src/semmle/javascript/dependencies/FrameworkLibraries.qll
index 36fce69f139b..1cb739e4a223 100644
--- a/javascript/ql/src/semmle/javascript/dependencies/FrameworkLibraries.qll
+++ b/javascript/ql/src/semmle/javascript/dependencies/FrameworkLibraries.qll
@@ -33,7 +33,7 @@ import javascript
  */
 abstract class FrameworkLibrary extends string {
   bindingset[this]
-  FrameworkLibrary() { this=this }
+  FrameworkLibrary() { this = this }
 
   /**
    * Gets the unique identifier of this framework library.
@@ -75,9 +75,7 @@ abstract class FrameworkLibraryInstance extends Script {
  * via the `src` attribute of a `<script>` element.
  */
 abstract class FrameworkLibraryReference extends HTML::Attribute {
-  FrameworkLibraryReference() {
-    getName() = "src" and getElement() instanceof HTML::ScriptElement
-  }
+  FrameworkLibraryReference() { getName() = "src" and getElement() instanceof HTML::ScriptElement }
 
   /**
    * Holds if this is a reference to version `v` of framework library `fl`.
@@ -90,7 +88,7 @@ abstract class FrameworkLibraryReference extends HTML::Attribute {
  */
 abstract class FrameworkLibraryWithMarkerComment extends FrameworkLibrary {
   bindingset[this]
-  FrameworkLibraryWithMarkerComment() { this=this }
+  FrameworkLibraryWithMarkerComment() { this = this }
 
   /**
    * Gets a regular expression that can be used to identify an instance of
@@ -110,7 +108,7 @@ abstract class FrameworkLibraryWithMarkerComment extends FrameworkLibrary {
  */
 abstract class FrameworkLibraryWithURLRegex extends FrameworkLibrary {
   bindingset[this]
-  FrameworkLibraryWithURLRegex() { this=this }
+  FrameworkLibraryWithURLRegex() { this = this }
 
   /**
    * Gets a regular expression that can be used to identify a URL referring
@@ -139,16 +137,16 @@ abstract class FrameworkLibraryWithURLRegex extends FrameworkLibrary {
  */
 abstract class FrameworkLibraryWithGenericURL extends FrameworkLibraryWithURLRegex {
   bindingset[this]
-  FrameworkLibraryWithGenericURL() { this=this }
+  FrameworkLibraryWithGenericURL() { this = this }
 
   /** Gets an alternative name of this library. */
   string getAnAlias() { none() }
 
   override string getAURLRegex() {
-    exists (string id | id = getId() or id = getAnAlias() |
+    exists(string id | id = getId() or id = getAnAlias() |
       result = ".*(?:^|/)" + id + "-(" + semverRegex() + ")" + variantRegex() + "\\.js" or
-      result = ".*/(?:\\w+@)?(" + semverRegex() +
-               ")/(?:(?:dist|js|" + id + ")/)?" + id + variantRegex() + "\\.js"
+      result = ".*/(?:\\w+@)?(" + semverRegex() + ")/(?:(?:dist|js|" + id + ")/)?" + id +
+          variantRegex() + "\\.js"
     )
   }
 }
@@ -161,7 +159,7 @@ abstract class FrameworkLibraryWithGenericURL extends FrameworkLibraryWithURLReg
  */
 private string variantRegex() {
   result = "([.-](slim|min|debug|dbg|umd|dev|all|testing|polyfills|" +
-                 "core|compat|more|modern|sandbox|rtl|with-addons|legacy))*"
+      "core|compat|more|modern|sandbox|rtl|with-addons|legacy))*"
 }
 
 /**
@@ -171,16 +169,14 @@ private string variantRegex() {
  * `<major>.<minor>.<patch>-beta.<n>`, where `.<patch>` and/or
  * `-beta.<n>` may be missing.
  */
-private string semverRegex() {
-  result = "\\d+\\.\\d+(?:\\.\\d+)?(?:-beta\\.\\d+)?"
-}
-
+private string semverRegex() { result = "\\d+\\.\\d+(?:\\.\\d+)?(?:-beta\\.\\d+)?" }
 
 /**
  * An instance of a `FrameworkLibraryWithMarkerComment`.
  */
 class FrameworkLibraryInstanceWithMarkerComment extends FrameworkLibraryInstance {
   FrameworkLibraryInstanceWithMarkerComment() { matchMarkerComment(_, this, _, _) }
+
   override predicate info(FrameworkLibrary fl, string v) { matchMarkerComment(_, this, fl, v) }
 }
 
@@ -188,21 +184,21 @@ class FrameworkLibraryInstanceWithMarkerComment extends FrameworkLibraryInstance
  * Holds if comment `c` in toplevel `tl` matches the marker comment of library
  * `fl` at `version`.
  */
-private predicate matchMarkerComment(Comment c, TopLevel tl,
-                                     FrameworkLibraryWithMarkerComment fl, string version) {
+private predicate matchMarkerComment(
+  Comment c, TopLevel tl, FrameworkLibraryWithMarkerComment fl, string version
+) {
   c.getTopLevel() = tl and
-  exists (string r |
-    r = fl.getAMarkerCommentRegex().replaceAll("<VERSION>", versionRegex()) |
+  exists(string r | r = fl.getAMarkerCommentRegex().replaceAll("<VERSION>", versionRegex()) |
     version = c.getText().regexpCapture(r, 1)
   )
 }
 
-
 /**
  * A reference to a `FrameworkLibraryWithURL`.
  */
 class FrameworkLibraryReferenceWithURL extends FrameworkLibraryReference {
   FrameworkLibraryReferenceWithURL() { matchURL(this, _, _) }
+
   override predicate info(FrameworkLibrary fl, string v) { matchURL(this, fl, v) }
 }
 
@@ -211,24 +207,22 @@ class FrameworkLibraryReferenceWithURL extends FrameworkLibraryReference {
  * `fl` at `version`.
  */
 private predicate matchURL(HTML::Attribute attr, FrameworkLibraryWithURLRegex fl, string version) {
-  attr.getName() = "src" and attr.getElement() instanceof HTML::ScriptElement and
+  attr.getName() = "src" and
+  attr.getElement() instanceof HTML::ScriptElement and
   version = attr.getValue().regexpCapture(fl.getAURLRegex(), 1)
 }
 
-
 /**
  * Gets a regular expression for matching versions specified in marker comments.
  */
-private string versionRegex() {
-  result = "\\d+\\.\\d+[A-Za-z0-9.+_-]*"
-}
-
+private string versionRegex() { result = "\\d+\\.\\d+[A-Za-z0-9.+_-]*" }
 
 /**
  * The jQuery framework.
  */
 private class JQuery extends FrameworkLibraryWithGenericURL {
   JQuery() { this = "jquery" }
+
   override string getAnEntryPoint() { result = "$" or result = "jQuery" }
 }
 
@@ -238,10 +232,10 @@ private class JQuery extends FrameworkLibraryWithGenericURL {
  */
 private predicate jQueryMarkerComment(Comment c, TopLevel tl, string version) {
   tl = c.getTopLevel() and
-  exists (string txt | txt = c.getText() |
+  exists(string txt | txt = c.getText() |
     // more recent versions use this format
-    version = txt.regexpCapture("(?s).*jQuery (?:JavaScript Library )?v(" +
-                                versionRegex() + ").*", 1)
+    version = txt
+          .regexpCapture("(?s).*jQuery (?:JavaScript Library )?v(" + versionRegex() + ").*", 1)
     or
     // earlier versions used this format
     version = txt.regexpCapture("(?s).*jQuery (" + versionRegex() + ") - New Wave Javascript.*", 1)
@@ -256,31 +250,34 @@ private predicate jQueryMarkerComment(Comment c, TopLevel tl, string version) {
  */
 private class JQueryInstance extends FrameworkLibraryInstance {
   JQueryInstance() { jQueryMarkerComment(_, this, _) }
+
   override predicate info(FrameworkLibrary fl, string v) {
     fl instanceof JQuery and
     jQueryMarkerComment(_, this, v)
   }
 }
 
-
 /**
  * The jQuery Mobile framework.
  */
-private class JQueryMobile extends FrameworkLibraryWithGenericURL,
-                                   FrameworkLibraryWithMarkerComment {
+private class JQueryMobile extends FrameworkLibraryWithGenericURL, FrameworkLibraryWithMarkerComment {
   JQueryMobile() { this = "jquery-mobile" }
+
   override string getAnAlias() { result = "jquery.mobile" }
+
   override string getAMarkerCommentRegex() { result = "(?s).*jQuery Mobile (<VERSION>).*" }
+
   override string getAnEntryPoint() { result = "$.mobile" or result = "jQuery.mobile" }
 }
 
-
 /**
  * The jQuery UI framework.
  */
 private class JQueryUI extends FrameworkLibraryWithGenericURL, FrameworkLibraryWithMarkerComment {
   JQueryUI() { this = "jquery-ui" }
+
   override string getAMarkerCommentRegex() { result = "(?s).*jQuery UI - v?(<VERSION>).*" }
+
   override string getAnEntryPoint() { result = "$.ui" or result = "jQuery.ui" }
 }
 
@@ -288,12 +285,15 @@ private class JQueryUI extends FrameworkLibraryWithGenericURL, FrameworkLibraryW
  * The jQuery TextExt framework.
  */
 private class JQueryTextExt extends FrameworkLibraryWithGenericURL,
-                                    FrameworkLibraryWithMarkerComment {
+  FrameworkLibraryWithMarkerComment {
   JQueryTextExt() { this = "jquery-textext" }
+
   override string getAnAlias() { result = "jquery.textext" }
+
   override string getAMarkerCommentRegex() {
     result = "(?s).*jQuery TextExt Plugin.*@version (<VERSION>).*"
   }
+
   override string getAnEntryPoint() { result = "$.text" or result = "jQuery.text" }
 }
 
@@ -301,9 +301,11 @@ private class JQueryTextExt extends FrameworkLibraryWithGenericURL,
  * The jQuery DataTables framework.
  */
 private class JQueryDataTables extends FrameworkLibraryWithGenericURL,
-                                    FrameworkLibraryWithMarkerComment {
+  FrameworkLibraryWithMarkerComment {
   JQueryDataTables() { this = "jquery-dataTables" }
+
   override string getAnAlias() { result = "jquery.dataTables" }
+
   override string getAMarkerCommentRegex() {
     result = "(?s).*@version\\s+(<VERSION>).*@file\\s+jquery\\.dataTables\\.js.*"
   }
@@ -312,22 +314,23 @@ private class JQueryDataTables extends FrameworkLibraryWithGenericURL,
 /**
  * The jQuery jsTree framework.
  */
-private class JQueryJsTree extends FrameworkLibraryWithGenericURL,
-                                    FrameworkLibraryWithMarkerComment {
+private class JQueryJsTree extends FrameworkLibraryWithGenericURL, FrameworkLibraryWithMarkerComment {
   JQueryJsTree() { this = "jquery-jstree" }
+
   override string getAnAlias() { result = "jquery.jstree" }
-  override string getAMarkerCommentRegex() {
-    result = "(?s).*jsTree (<VERSION>).*"
-  }
+
+  override string getAMarkerCommentRegex() { result = "(?s).*jsTree (<VERSION>).*" }
 }
 
 /**
  * The jQuery Snippet framework.
  */
 private class JQuerySnippet extends FrameworkLibraryWithGenericURL,
-                                    FrameworkLibraryWithMarkerComment {
+  FrameworkLibraryWithMarkerComment {
   JQuerySnippet() { this = "jquery-snippet" }
+
   override string getAnAlias() { result = "jquery.snippet" }
+
   override string getAMarkerCommentRegex() {
     result = "(?s).*Snippet :: jQuery Syntax Highlighter v(<VERSION>).*"
   }
@@ -338,9 +341,11 @@ private class JQuerySnippet extends FrameworkLibraryWithGenericURL,
  */
 private class Bootstrap extends FrameworkLibraryWithGenericURL, FrameworkLibraryWithMarkerComment {
   Bootstrap() { this = "bootstrap" }
+
   override string getAMarkerCommentRegex() {
     result = "(?s).*Bootstrap v(<VERSION>) \\(http://getbootstrap.com\\).*"
   }
+
   override string getAnEntryPoint() { result = "$" }
 }
 
@@ -349,9 +354,11 @@ private class Bootstrap extends FrameworkLibraryWithGenericURL, FrameworkLibrary
  */
 private class Modernizr extends FrameworkLibraryWithGenericURL, FrameworkLibraryWithMarkerComment {
   Modernizr() { this = "modernizr" }
+
   override string getAMarkerCommentRegex() {
     result = "(?s).*(?<!@license )Modernizr (?:JavaScript library )?v?(<VERSION>).*"
   }
+
   override string getAnEntryPoint() { result = "Modernizr" }
 }
 
@@ -360,6 +367,7 @@ private class Modernizr extends FrameworkLibraryWithGenericURL, FrameworkLibrary
  */
 private class MooTools extends FrameworkLibraryWithGenericURL {
   MooTools() { this = "mootools" }
+
   override string getAnEntryPoint() { /* not easily detectable */ none() }
 }
 
@@ -376,8 +384,9 @@ private class MooTools extends FrameworkLibraryWithGenericURL {
  * ```
  */
 private predicate mooToolsObject(ObjectExpr oe, TopLevel tl, string version) {
-  exists (AssignExpr assgn, DotExpr d |
-    tl = oe.getTopLevel() and assgn.getLhs() = d and assgn.getRhs() = oe |
+  exists(AssignExpr assgn, DotExpr d |
+    tl = oe.getTopLevel() and assgn.getLhs() = d and assgn.getRhs() = oe
+  |
     d.getBase() instanceof ThisExpr and
     d.getPropertyName() = "MooTools" and
     version = oe.getPropertyByName("version").getInit().(ConstantString).getStringValue()
@@ -389,18 +398,19 @@ private predicate mooToolsObject(ObjectExpr oe, TopLevel tl, string version) {
  */
 private class MooToolsInstance extends FrameworkLibraryInstance {
   MooToolsInstance() { mooToolsObject(_, this, _) }
+
   override predicate info(FrameworkLibrary fl, string v) {
     fl instanceof MooTools and
     mooToolsObject(_, this, v)
   }
 }
 
-
 /**
  * The Prototype framework.
  */
 private class Prototype extends FrameworkLibraryWithGenericURL {
   Prototype() { this = "prototype" }
+
   override string getAnEntryPoint() { /* not easily detectable */ none() }
 }
 
@@ -416,7 +426,7 @@ private class Prototype extends FrameworkLibraryWithGenericURL {
  * ```
  */
 private predicate prototypeObject(ObjectExpr oe, TopLevel tl, string version) {
-  exists (VariableDeclarator vd | tl = vd.getTopLevel() and oe = vd.getInit() |
+  exists(VariableDeclarator vd | tl = vd.getTopLevel() and oe = vd.getInit() |
     vd.getBindingPattern().(Identifier).getName() = "Prototype" and
     version = oe.getPropertyByName("Version").getInit().(ConstantString).getStringValue()
   )
@@ -427,18 +437,19 @@ private predicate prototypeObject(ObjectExpr oe, TopLevel tl, string version) {
  */
 private class PrototypeInstance extends FrameworkLibraryInstance {
   PrototypeInstance() { prototypeObject(_, this, _) }
+
   override predicate info(FrameworkLibrary fl, string v) {
     fl instanceof Prototype and
     prototypeObject(_, this, v)
   }
 }
 
-
 /**
  * The Scriptaculous framework.
  */
 private class Scriptaculous extends FrameworkLibraryWithGenericURL {
   Scriptaculous() { this = "scriptaculous" }
+
   override string getAnEntryPoint() { /* not easily detectable */ none() }
 }
 
@@ -454,7 +465,7 @@ private class Scriptaculous extends FrameworkLibraryWithGenericURL {
  * ```
  */
 private predicate scriptaculousObject(ObjectExpr oe, TopLevel tl, string version) {
-  exists (VariableDeclarator vd | tl = vd.getTopLevel() and oe = vd.getInit() |
+  exists(VariableDeclarator vd | tl = vd.getTopLevel() and oe = vd.getInit() |
     vd.getBindingPattern().(Identifier).getName() = "Scriptaculous" and
     version = oe.getPropertyByName("Version").getInit().(ConstantString).getStringValue()
   )
@@ -465,23 +476,24 @@ private predicate scriptaculousObject(ObjectExpr oe, TopLevel tl, string version
  */
 private class ScriptaculousInstance extends FrameworkLibraryInstance {
   ScriptaculousInstance() { scriptaculousObject(_, this, _) }
+
   override predicate info(FrameworkLibrary fl, string v) {
     fl instanceof Scriptaculous and
     scriptaculousObject(_, this, v)
   }
 }
 
-
 /**
  * The Underscore framework.
  */
 private class Underscore extends FrameworkLibraryWithGenericURL, FrameworkLibraryWithMarkerComment {
   Underscore() { this = "underscore" }
+
   override string getAMarkerCommentRegex() { result = "^\\s*Underscore.js (<VERSION>).*" }
+
   override string getAnEntryPoint() { result = "_" }
 }
 
-
 /**
  * The Lodash framework.
  */
@@ -489,18 +501,17 @@ private class Lodash extends FrameworkLibraryWithGenericURL, FrameworkLibraryWit
   Lodash() { this = "lodash" }
 
   override string getAMarkerCommentRegex() {
-    result = "(?s).* (?:lod|Lo-D)ash (<VERSION>)" +
-             "(?: \\(Custom Build\\))? " +
-             "<https?://lodash.com/>.*"
+    result = "(?s).* (?:lod|Lo-D)ash (<VERSION>)" + "(?: \\(Custom Build\\))? " +
+        "<https?://lodash.com/>.*"
   }
 
   override string getAnEntryPoint() { result = "_" }
 }
 
-
 /** The Dojo framework. */
 private class Dojo extends FrameworkLibraryWithGenericURL {
   Dojo() { this = "dojo" }
+
   override string getAnEntryPoint() { result = "dojo" }
 }
 
@@ -520,13 +531,13 @@ private predicate dojoMarkerComment(Comment c, TopLevel tl, string version) {
  */
 private class DojoInstance extends FrameworkLibraryInstance {
   DojoInstance() { dojoMarkerComment(_, this, _) }
+
   override predicate info(FrameworkLibrary fl, string v) {
     fl instanceof Dojo and
     dojoMarkerComment(_, this, v)
   }
 }
 
-
 /**
  * The ExtJS framework.
  */
@@ -543,39 +554,38 @@ private class ExtJS extends FrameworkLibraryWithGenericURL, FrameworkLibraryWith
   override string getAnEntryPoint() { result = "Ext" }
 }
 
-
 /**
  * The YUI framework.
  */
 private class YUI extends FrameworkLibraryWithGenericURL, FrameworkLibraryWithMarkerComment {
   YUI() { this = "yui" }
-  override string getAMarkerCommentRegex() {
-    result = "(?s).*YUI (<VERSION>) \\(build \\d+\\).*"
-  }
+
+  override string getAMarkerCommentRegex() { result = "(?s).*YUI (<VERSION>) \\(build \\d+\\).*" }
 
   override string getAnEntryPoint() { result = "YUI" }
 }
 
-
 /**
  * The Knockout framework.
  */
 private class Knockout extends FrameworkLibraryWithGenericURL, FrameworkLibraryWithMarkerComment {
   Knockout() { this = "knockout" }
+
   override string getAMarkerCommentRegex() {
     result = "(?s).*Knockout JavaScript library v(<VERSION>).*"
   }
+
   override string getAnEntryPoint() { result = "ko" }
 }
 
-
-
 /**
  * The AngularJS framework.
  */
 private class AngularJS extends FrameworkLibraryWithGenericURL {
   AngularJS() { this = "angularjs" }
+
   override string getAnAlias() { result = "angular" or result = "angular2" }
+
   override string getAnEntryPoint() { result = "angular" }
 }
 
@@ -588,9 +598,9 @@ private class AngularJS extends FrameworkLibraryWithGenericURL {
 private predicate angularMarkerComment(Comment c, TopLevel tl, string version) {
   tl = c.getTopLevel() and
   (
-   version = c.getText().regexpCapture("(?s).*AngularJS v(" + versionRegex() + ").*", 1)
-   or
-   c.getText().regexpMatch("(?s).*Copyright \\(c\\) 20.. Adam Abrons.*") and version = "unknown"
+    version = c.getText().regexpCapture("(?s).*AngularJS v(" + versionRegex() + ").*", 1)
+    or
+    c.getText().regexpMatch("(?s).*Copyright \\(c\\) 20.. Adam Abrons.*") and version = "unknown"
   )
 }
 
@@ -599,22 +609,22 @@ private predicate angularMarkerComment(Comment c, TopLevel tl, string version) {
  */
 private class AngularJSInstance extends FrameworkLibraryInstance {
   AngularJSInstance() { angularMarkerComment(_, this, _) }
+
   override predicate info(FrameworkLibrary fl, string v) {
     fl instanceof AngularJS and
     angularMarkerComment(_, this, v)
   }
 }
 
-
 /**
  * The Angular UI bootstrap framework.
  */
 private class AngularUIBootstrap extends FrameworkLibraryWithGenericURL {
   AngularUIBootstrap() { this = "angular-ui-bootstrap" }
+
   override string getAnAlias() { result = "ui-bootstrap" }
 }
 
-
 /**
  * Holds if comment `c` in toplevel `tl` is a marker comment for the given
  * `version` of AngularUI bootstrap.
@@ -630,24 +640,24 @@ private predicate angularUIBootstrapMarkerComment(Comment c, TopLevel tl, string
  */
 private class AngularUIBootstrapInstance extends FrameworkLibraryInstance {
   AngularUIBootstrapInstance() { angularUIBootstrapMarkerComment(_, this, _) }
+
   override predicate info(FrameworkLibrary fl, string v) {
     fl instanceof AngularUIBootstrap and
     angularUIBootstrapMarkerComment(_, this, v)
   }
 }
 
-
 /**
  * The React framework.
  */
 private class React extends FrameworkLibraryWithGenericURL, FrameworkLibraryWithMarkerComment {
   React() { this = "react" }
+
   override string getAMarkerCommentRegex() {
     result = "(?s).*React(?:DOM(?:Server)?| \\(with addons\\))? v(<VERSION>).*"
   }
 }
 
-
 /**
  * The Microsoft AJAX Framework.
  */
@@ -659,8 +669,9 @@ private class MicrosoftAJAXFramework extends FrameworkLibrary {
  * Holds if comments `c1` and `c2` in toplevel `tl` are marker comments for the given
  * `version` of the Microsoft AJAX Framework.
  */
-private predicate microsoftAJAXFrameworkMarkerComments(Comment c1, Comment c2,
-                                                       TopLevel tl, string version) {
+private predicate microsoftAJAXFrameworkMarkerComments(
+  Comment c1, Comment c2, TopLevel tl, string version
+) {
   tl = c1.getTopLevel() and
   tl = c2.getTopLevel() and
   c1.getText().regexpMatch("(?s).*Microsoft AJAX Framework.*") and
@@ -672,6 +683,7 @@ private predicate microsoftAJAXFrameworkMarkerComments(Comment c1, Comment c2,
  */
 private class MicrosoftAJAXFrameworkInstance extends FrameworkLibraryInstance {
   MicrosoftAJAXFrameworkInstance() { microsoftAJAXFrameworkMarkerComments(_, _, this, _) }
+
   override predicate info(FrameworkLibrary fl, string v) {
     fl instanceof MicrosoftAJAXFramework and
     microsoftAJAXFrameworkMarkerComments(_, _, this, v)
@@ -683,6 +695,7 @@ private class MicrosoftAJAXFrameworkInstance extends FrameworkLibraryInstance {
  */
 private class Polymer extends FrameworkLibraryWithGenericURL {
   Polymer() { this = "polymer" }
+
   override string getAnEntryPoint() { result = "Polymer" }
 }
 
@@ -691,11 +704,11 @@ private class Polymer extends FrameworkLibraryWithGenericURL {
  */
 private predicate isPolymer(TopLevel tl, string version) {
   // tl contains both a license comment...
-  exists (Comment c | c.getTopLevel() = tl |
+  exists(Comment c | c.getTopLevel() = tl |
     c.getText().matches("%Copyright (c) 20__ The Polymer Project Authors. All rights reserved.%")
   ) and
   // ...and a version comment
-  exists (Comment c | c.getTopLevel() = tl |
+  exists(Comment c | c.getTopLevel() = tl |
     version = c.getText().regexpCapture("(?s).*@version:? (" + versionRegex() + ").*", 1)
   )
 }
@@ -705,6 +718,7 @@ private predicate isPolymer(TopLevel tl, string version) {
  */
 private class PolymerInstance extends FrameworkLibraryInstance {
   PolymerInstance() { isPolymer(this, _) }
+
   override predicate info(FrameworkLibrary fl, string v) {
     fl instanceof Polymer and
     isPolymer(this, v)
@@ -716,9 +730,9 @@ private class PolymerInstance extends FrameworkLibraryInstance {
  */
 private class VueJS extends FrameworkLibraryWithGenericURL, FrameworkLibraryWithMarkerComment {
   VueJS() { this = "vue" }
-  override string getAMarkerCommentRegex() {
-    result = "(?s).*Vue\\.js v(<VERSION>).*"
-  }
+
+  override string getAMarkerCommentRegex() { result = "(?s).*Vue\\.js v(<VERSION>).*" }
+
   override string getAnEntryPoint() { result = "Vue" }
 }
 
@@ -727,6 +741,7 @@ private class VueJS extends FrameworkLibraryWithGenericURL, FrameworkLibraryWith
  */
 private class SwaggerUI extends FrameworkLibraryWithGenericURL, FrameworkLibraryWithMarkerComment {
   SwaggerUI() { this = "swagger-ui" }
+
   override string getAMarkerCommentRegex() {
     result = "(?s).*swagger-ui - Swagger UI.*@version v(<VERSION>).*"
   }
@@ -737,9 +752,9 @@ private class SwaggerUI extends FrameworkLibraryWithGenericURL, FrameworkLibrary
  */
 private class BackboneJS extends FrameworkLibraryWithGenericURL, FrameworkLibraryWithMarkerComment {
   BackboneJS() { this = "backbone" }
-  override string getAMarkerCommentRegex() {
-    result = "(?s).*Backbone\\.js (<VERSION>).*"
-  }
+
+  override string getAMarkerCommentRegex() { result = "(?s).*Backbone\\.js (<VERSION>).*" }
+
   override string getAnEntryPoint() { result = "Backbone" }
 }
 
@@ -748,9 +763,11 @@ private class BackboneJS extends FrameworkLibraryWithGenericURL, FrameworkLibrar
  */
 private class EmberJS extends FrameworkLibraryWithGenericURL, FrameworkLibraryWithMarkerComment {
   EmberJS() { this = "ember" }
+
   override string getAMarkerCommentRegex() {
     result = "(?s).*Ember - JavaScript Application Framework.*@version\\s*(<VERSION>).*"
   }
+
   override string getAnEntryPoint() { result = "Ember" }
 }
 
@@ -759,42 +776,36 @@ private class EmberJS extends FrameworkLibraryWithGenericURL, FrameworkLibraryWi
  */
 private class QUnitJS extends FrameworkLibraryWithGenericURL, FrameworkLibraryWithMarkerComment {
   QUnitJS() { this = "qunit" }
-  override string getAMarkerCommentRegex() {
-    result = "(?s).*QUnit\\s*(<VERSION>).*"
-  }
+
+  override string getAMarkerCommentRegex() { result = "(?s).*QUnit\\s*(<VERSION>).*" }
+
   override string getAnEntryPoint() { result = "QUnit" }
 }
 
 /**
  * The Mocha framework.
  */
-private class Mocha extends FrameworkLibraryWithGenericURL {
-  Mocha() { this = "mocha" }
-}
+private class Mocha extends FrameworkLibraryWithGenericURL { Mocha() { this = "mocha" } }
 
 /**
  * The Jasmine framework.
  */
-private class Jasmine extends FrameworkLibraryWithGenericURL {
-  Jasmine() { this = "jasmine" }
-}
+private class Jasmine extends FrameworkLibraryWithGenericURL { Jasmine() { this = "jasmine" } }
 
 /**
  * The Chai framework.
  */
-private class Chai extends FrameworkLibraryWithGenericURL {
-  Chai() { this = "chai" }
-}
+private class Chai extends FrameworkLibraryWithGenericURL { Chai() { this = "chai" } }
 
 /**
  * The Sinon.JS framework.
  */
 private class SinonJS extends FrameworkLibraryWithGenericURL, FrameworkLibraryWithMarkerComment {
   SinonJS() { this = "sinon" }
+
   override string getAnAlias() { result = "sinon-ie" or result = "sinon-timers" }
-  override string getAMarkerCommentRegex() {
-    result = "(?s).*Sinon\\.JS\\s*(<VERSION>).*"
-  }
+
+  override string getAMarkerCommentRegex() { result = "(?s).*Sinon\\.JS\\s*(<VERSION>).*" }
 }
 
 /**
@@ -802,6 +813,7 @@ private class SinonJS extends FrameworkLibraryWithGenericURL, FrameworkLibraryWi
  */
 private class TinyMCE extends FrameworkLibraryWithGenericURL {
   TinyMCE() { this = "tinymce" }
+
   override string getAnAlias() { result = "jquery.tinymce" or result = "tinymce.jquery" }
 }
 
@@ -810,10 +822,10 @@ private class TinyMCE extends FrameworkLibraryWithGenericURL {
  */
 private class RequireJS extends FrameworkLibraryWithGenericURL, FrameworkLibraryWithMarkerComment {
   RequireJS() { this = "requirejs" }
+
   override string getAnAlias() { result = "require.js" }
-  override string getAMarkerCommentRegex() {
-    result = "(?s).*RequireJS\\s*(<VERSION>).*"
-  }
+
+  override string getAMarkerCommentRegex() { result = "(?s).*RequireJS\\s*(<VERSION>).*" }
 }
 
 /**
@@ -823,7 +835,11 @@ private class ApplicationInsightsInstance extends FrameworkLibraryInstance {
   string version;
 
   ApplicationInsightsInstance() {
-    version = this.(TopLevel).getFile().getAbsolutePath().regexpCapture(any(ApplicationInsights t).getAURLRegex(), 1)
+    version = this
+          .(TopLevel)
+          .getFile()
+          .getAbsolutePath()
+          .regexpCapture(any(ApplicationInsights t).getAURLRegex(), 1)
   }
 
   override predicate info(FrameworkLibrary fl, string v) {
@@ -838,9 +854,7 @@ private class ApplicationInsightsInstance extends FrameworkLibraryInstance {
 private class ApplicationInsights extends FrameworkLibraryWithURLRegex {
   ApplicationInsights() { this = "ApplicationInsights" }
 
-  override string getAURLRegex() {
-    result = ".*(?:^|/)ai\\.(" + semverRegex() + ")-build\\d+\\.js"
-  }
+  override string getAURLRegex() { result = ".*(?:^|/)ai\\.(" + semverRegex() + ")-build\\d+\\.js" }
 }
 
 /**
@@ -849,9 +863,7 @@ private class ApplicationInsights extends FrameworkLibraryWithURLRegex {
 private class TwitterText extends FrameworkLibraryWithGenericURL, FrameworkLibraryWithMarkerComment {
   TwitterText() { this = "twitter-text" }
 
-  override string getAMarkerCommentRegex() {
-    result = "(?s).*twitter-text\\s*(<VERSION>).*"
-  }
+  override string getAMarkerCommentRegex() { result = "(?s).*twitter-text\\s*(<VERSION>).*" }
 }
 
 /**
@@ -860,9 +872,7 @@ private class TwitterText extends FrameworkLibraryWithGenericURL, FrameworkLibra
 private class TwitterTextClassic extends FrameworkLibraryWithURLRegex {
   TwitterTextClassic() { this = "twitter-text" }
 
-  override string getAURLRegex() {
-    result = ".*(?:^|/)twitter_text" + variantRegex() + "\\.js"
-  }
+  override string getAURLRegex() { result = ".*(?:^|/)twitter_text" + variantRegex() + "\\.js" }
 }
 
 /**
@@ -870,8 +880,13 @@ private class TwitterTextClassic extends FrameworkLibraryWithURLRegex {
  */
 private class TwitterTextClassicInstance extends FrameworkLibraryInstance {
   TwitterTextClassicInstance() {
-    this.(TopLevel).getFile().getAbsolutePath().regexpMatch(any(TwitterTextClassic t).getAURLRegex())
+    this
+        .(TopLevel)
+        .getFile()
+        .getAbsolutePath()
+        .regexpMatch(any(TwitterTextClassic t).getAURLRegex())
   }
+
   override predicate info(FrameworkLibrary fl, string v) {
     fl instanceof TwitterTextClassic and
     v = ""
@@ -886,11 +901,7 @@ private class TwitterTextClassicInstance extends FrameworkLibraryInstance {
 private class FrameworkLibraryReferenceToInstance extends FrameworkLibraryReference {
   FrameworkLibraryInstance fli;
 
-  FrameworkLibraryReferenceToInstance() {
-    fli = getElement().(HTML::ScriptElement).resolveSource()
-  }
+  FrameworkLibraryReferenceToInstance() { fli = getElement().(HTML::ScriptElement).resolveSource() }
 
-  override predicate info(FrameworkLibrary fl, string v) {
-    fli.info(fl, v)
-  }
+  override predicate info(FrameworkLibrary fl, string v) { fli.info(fl, v) }
 }
diff --git a/javascript/ql/src/semmle/javascript/frameworks/AWS.qll b/javascript/ql/src/semmle/javascript/frameworks/AWS.qll
index 2a83548c895d..120f47bb9527 100644
--- a/javascript/ql/src/semmle/javascript/frameworks/AWS.qll
+++ b/javascript/ql/src/semmle/javascript/frameworks/AWS.qll
@@ -1,21 +1,20 @@
 /**
  * Provides classes for working with [AWS-SDK](https://aws.amazon.com/sdk-for-node-js/) applications.
  */
+
 import javascript
 
 module AWS {
-
   /**
    * Holds if the `i`th argument of `invk` is an object hash for `AWS.Config`.
    */
   private predicate takesConfigurationObject(InvokeExpr invk, int i) {
-    exists (DataFlow::ModuleImportNode mod |
-      mod.getPath() = "aws-sdk" |
+    exists(DataFlow::ModuleImportNode mod | mod.getPath() = "aws-sdk" |
       // `AWS.config.update(nd)`
       invk = mod.getAPropertyRead("config").getAMemberCall("update").asExpr() and
       i = 0
       or
-      exists (DataFlow::SourceNode cfg | cfg = mod.getAConstructorInvocation("Config") |
+      exists(DataFlow::SourceNode cfg | cfg = mod.getAConstructorInvocation("Config") |
         // `new AWS.Config(nd)`
         invk = cfg.asExpr() and
         i = 0
@@ -31,21 +30,19 @@ module AWS {
    * An expression that is used as an AWS config value: `{ accessKeyId: <user>, secretAccessKey: <password>}`.
    */
   class Credentials extends CredentialsExpr {
-
     string kind;
 
     Credentials() {
-      exists (string prop, InvokeExpr invk, int i |
+      exists(string prop, InvokeExpr invk, int i |
         takesConfigurationObject(invk, i) and
-        invk.hasOptionArgument(i, prop, this) |
-        prop = "accessKeyId" and kind = "user name" or
+        invk.hasOptionArgument(i, prop, this)
+      |
+        prop = "accessKeyId" and kind = "user name"
+        or
         prop = "secretAccessKey" and kind = "password"
       )
     }
 
-    override string getCredentialsKind() {
-      result = kind
-    }
-
+    override string getCredentialsKind() { result = kind }
   }
-}
\ No newline at end of file
+}
diff --git a/javascript/ql/src/semmle/javascript/frameworks/AngularJS.qll b/javascript/ql/src/semmle/javascript/frameworks/AngularJS.qll
index a3e40bcea16f..a90e1dd4995e 100644
--- a/javascript/ql/src/semmle/javascript/frameworks/AngularJS.qll
+++ b/javascript/ql/src/semmle/javascript/frameworks/AngularJS.qll
@@ -4,9 +4,7 @@
  *
  * NOTE: The API of this library is not stable yet and may change in
  *       the future.
- *
  */
-
 module AngularJS {
   import AngularJS.AngularJSCore
   import AngularJS.ServiceDefinitions
diff --git a/javascript/ql/src/semmle/javascript/frameworks/AngularJS/AngularJSCore.qll b/javascript/ql/src/semmle/javascript/frameworks/AngularJS/AngularJSCore.qll
index 84b238b1890b..f5eb22ab8d5c 100644
--- a/javascript/ql/src/semmle/javascript/frameworks/AngularJS/AngularJSCore.qll
+++ b/javascript/ql/src/semmle/javascript/frameworks/AngularJS/AngularJSCore.qll
@@ -7,7 +7,6 @@
  *
  * NOTE: The API of this library is not stable yet and may change in
  *       the future.
- *
  */
 
 import javascript
@@ -27,17 +26,16 @@ DataFlow::SourceNode angular() {
 /**
  * DEPRECATED: Use `angular()` instead.
  */
-deprecated predicate isAngularRef(DataFlowNode nd) {
-  angular().flowsToExpr(nd)
-}
+deprecated predicate isAngularRef(DataFlowNode nd) { angular().flowsToExpr(nd) }
 
 pragma[noopt]
 private predicate isAngularString(Expr s) {
-  exists (DataFlow::SourceNode angular, StmtContainer sc, TopLevel tl |
+  exists(DataFlow::SourceNode angular, StmtContainer sc, TopLevel tl |
     angular = angular() and
     sc = angular.getContainer() and
     tl = sc.getTopLevel() and
-    tl = s.getTopLevel() |
+    tl = s.getTopLevel()
+  |
     s instanceof StringLiteral or
     s instanceof TemplateLiteral
   )
@@ -48,9 +46,7 @@ private predicate isAngularString(Expr s) {
  * want to track them.
  */
 private class TrackStringsInAngularCode extends DataFlow::SourceNode, DataFlow::ValueNode {
-  TrackStringsInAngularCode() {
-    isAngularString(astNode)
-  }
+  TrackStringsInAngularCode() { isAngularString(astNode) }
 }
 
 /**
@@ -64,9 +60,7 @@ private DataFlow::CallNode angularModuleCall(string name) {
 /**
  * An AngularJS module for which there is a definition or at least a lookup.
  */
-private newtype TAngularModule = MkAngularModule(string name) {
-  exists(angularModuleCall(name))
-}
+private newtype TAngularModule = MkAngularModule(string name) { exists(angularModuleCall(name)) }
 
 /**
  * An AngularJS module.
@@ -74,9 +68,7 @@ private newtype TAngularModule = MkAngularModule(string name) {
 class AngularModule extends TAngularModule {
   string name;
 
-  AngularModule() {
-    this = MkAngularModule(name)
-  }
+  AngularModule() { this = MkAngularModule(name) }
 
   /**
    * Get a definition for this module, that is, a call of the form
@@ -131,7 +123,7 @@ DataFlow::CallNode moduleRef(AngularModule m) {
   or
   result = m.getALookup()
   or
-  exists (DataFlow::CallNode inner, string methodName |
+  exists(DataFlow::CallNode inner, string methodName |
     inner = moduleRef(m) and
     result = inner.getAMethodCall(methodName) and
     // the one-argument variant of `info` is not chaining
@@ -149,20 +141,15 @@ class ModuleApiCall extends DataFlow::CallNode {
   /** The name of the called method. */
   string methodName;
 
-  ModuleApiCall() {
-    this = moduleRef(mod).getAMethodCall(methodName)
-  }
+  ModuleApiCall() { this = moduleRef(mod).getAMethodCall(methodName) }
 
   /**
    * Gets the name of the invoked method.
    */
-  string getMethodName() {
-    result = methodName
-  }
+  string getMethodName() { result = methodName }
 }
 
 class ModuleApiCallDependencyInjection extends DependencyInjection {
-
   ModuleApiCall call;
 
   string methodName;
@@ -178,17 +165,21 @@ class ModuleApiCallDependencyInjection extends DependencyInjection {
    * This method excludes the method names that are also present on the AngularJS '$provide' object.
    */
   private int injectableArgPos() {
-    (methodName = "directive" or
-      methodName = "filter" or methodName = "controller" or
-      methodName = "animation") and result = 1
-      or
-      (methodName = "config" or methodName = "run") and result = 0
+    (
+      methodName = "directive" or
+      methodName = "filter" or
+      methodName = "controller" or
+      methodName = "animation"
+    ) and
+    result = 1
+    or
+    (methodName = "config" or methodName = "run") and
+    result = 0
   }
 
   override DataFlow::Node getAnInjectableFunction() {
     result = call.getArgument(injectableArgPos())
   }
-
 }
 
 /**
@@ -257,11 +248,9 @@ private predicate builtinDirective(string name) {
 }
 
 private newtype TDirectiveInstance =
-MkBuiltinDirective(string name) { builtinDirective(name) }
-or
-MkCustomDirective(DirectiveDefinition def)
-or
-MkCustomComponent(ComponentDefinition def)
+  MkBuiltinDirective(string name) { builtinDirective(name) } or
+  MkCustomDirective(DirectiveDefinition def) or
+  MkCustomComponent(ComponentDefinition def)
 
 /**
  * An AngularJS directive, either built-in or custom.
@@ -282,9 +271,7 @@ class DirectiveInstance extends TDirectiveInstance {
   /**
    * Gets a DOM element matching this directive.
    */
-  DOM::ElementDefinition getAMatchingElement() {
-    result = getATarget().getElement()
-  }
+  DOM::ElementDefinition getAMatchingElement() { result = getATarget().getElement() }
 
   /** Gets a textual representation of this directive. */
   string toString() { result = getName() }
@@ -292,10 +279,7 @@ class DirectiveInstance extends TDirectiveInstance {
   /**
    * Gets a scope object for this directive.
    */
-  AngularScope getAScope() {
-    result.mayApplyTo(getAMatchingElement())
-  }
-
+  AngularScope getAScope() { result.mayApplyTo(getAMatchingElement()) }
 }
 
 /**
@@ -304,9 +288,7 @@ class DirectiveInstance extends TDirectiveInstance {
 class BuiltinDirective extends DirectiveInstance, MkBuiltinDirective {
   string name;
 
-  BuiltinDirective() {
-    this = MkBuiltinDirective(name)
-  }
+  BuiltinDirective() { this = MkBuiltinDirective(name) }
 
   override string getName() { result = name }
 }
@@ -323,14 +305,10 @@ abstract class CustomDirective extends DirectiveInstance {
   abstract DataFlow::ValueNode getMemberInit(string name);
 
   /** Gets the member `name` of this directive. */
-  DataFlow::SourceNode getMember(string name) {
-    result.flowsTo(getMemberInit(name))
-  }
+  DataFlow::SourceNode getMember(string name) { result.flowsTo(getMemberInit(name)) }
 
   /** Gets the method `name` of this directive. */
-  Function getMethod(string name) {
-    DataFlow::valueNode(result) = getMember(name)
-  }
+  Function getMethod(string name) { DataFlow::valueNode(result) = getMember(name) }
 
   /** Gets a link function of this directive. */
   abstract Function getALinkFunction();
@@ -345,14 +323,10 @@ abstract class CustomDirective extends DirectiveInstance {
   abstract DataFlow::SourceNode getAnInstantiation();
 
   /** Gets the controller function of this directive, if any. */
-  InjectableFunction getController() {
-    result = getMember("controller")
-  }
+  InjectableFunction getController() { result = getMember("controller") }
 
   /** Gets the template URL of this directive, if any. */
-  string getTemplateUrl() {
-    getMember("templateUrl").asExpr().mayHaveStringValue(result)
-  }
+  string getTemplateUrl() { getMember("templateUrl").asExpr().mayHaveStringValue(result) }
 
   /**
    * Gets a template file for this directive, if any.
@@ -365,10 +339,9 @@ abstract class CustomDirective extends DirectiveInstance {
    * Gets a scope object for this directive.
    */
   override AngularScope getAScope() {
-    if hasIsolateScope() then
-      result = MkIsolateScope(this)
-    else
-      result = DirectiveInstance.super.getAScope()
+    if hasIsolateScope()
+    then result = MkIsolateScope(this)
+    else result = DirectiveInstance.super.getAScope()
   }
 
   private string getRestrictionString() {
@@ -384,7 +357,6 @@ abstract class CustomDirective extends DirectiveInstance {
     result = DirectiveInstance.super.getATarget() and
     hasTargetType(result.getType())
   }
-
 }
 
 /**
@@ -394,21 +366,15 @@ class GeneralDirective extends CustomDirective, MkCustomDirective {
   /** The definition of this directive. */
   DirectiveDefinition definition;
 
-  GeneralDirective() {
-    this = MkCustomDirective(definition)
-  }
+  GeneralDirective() { this = MkCustomDirective(definition) }
 
-  override string getName() {
-    result = definition.getName()
-  }
+  override string getName() { result = definition.getName() }
 
-  override DataFlow::Node getDefinition() {
-    result = definition
-  }
+  override DataFlow::Node getDefinition() { result = definition }
 
   /** Gets a node that contributes to the return value of the factory function. */
   override DataFlow::SourceNode getAnInstantiation() {
-    exists (Function factory, InjectableFunction f |
+    exists(Function factory, InjectableFunction f |
       f = definition.getAFactoryFunction() and
       factory = f.asFunction() and
       result.flowsToExpr(factory.getAReturnedExpr())
@@ -420,9 +386,7 @@ class GeneralDirective extends CustomDirective, MkCustomDirective {
   }
 
   /** Gets the compile function of this directive, if any. */
-  Function getCompileFunction() {
-    result = getMethod("compile")
-  }
+  Function getCompileFunction() { result = getMethod("compile") }
 
   /**
    * Gets a pre/post link function of this directive defined on its definition object.
@@ -445,9 +409,10 @@ class GeneralDirective extends CustomDirective, MkCustomDirective {
     )
     or
     // { compile: function() { ... return link; } }
-    exists (Expr compileReturn, DataFlow::SourceNode compileReturnSrc |
+    exists(Expr compileReturn, DataFlow::SourceNode compileReturnSrc |
       compileReturn = getCompileFunction().getAReturnedExpr() and
-      compileReturnSrc.flowsToExpr(compileReturn) |
+      compileReturnSrc.flowsToExpr(compileReturn)
+    |
       // link = function postLink() { ... }
       kind = "post" and
       result = compileReturnSrc
@@ -461,26 +426,18 @@ class GeneralDirective extends CustomDirective, MkCustomDirective {
   }
 
   /** Gets the pre-link function of this directive. */
-  Function getPreLinkFunction() {
-    result = getLinkFunction("pre").getAstNode()
-  }
+  Function getPreLinkFunction() { result = getLinkFunction("pre").getAstNode() }
 
   /** Gets the post-link function of this directive. */
-  Function getPostLinkFunction() {
-    result = getLinkFunction("post").getAstNode()
-  }
+  Function getPostLinkFunction() { result = getLinkFunction("post").getAstNode() }
 
-  override Function getALinkFunction() {
-    result = getLinkFunction(_).getAstNode()
-  }
+  override Function getALinkFunction() { result = getLinkFunction(_).getAstNode() }
 
   override predicate bindsToController() {
     getMemberInit("bindToController").asExpr().mayHaveBooleanValue(true)
   }
 
-  override predicate hasIsolateScope() {
-    getMember("scope").asExpr() instanceof ObjectExpr
-  }
+  override predicate hasIsolateScope() { getMember("scope").asExpr() instanceof ObjectExpr }
 }
 
 /**
@@ -490,41 +447,30 @@ class ComponentDirective extends CustomDirective, MkCustomComponent {
   /** The definition of this component. */
   ComponentDefinition comp;
 
-  ComponentDirective() {
-    this = MkCustomComponent(comp)
-  }
+  ComponentDirective() { this = MkCustomComponent(comp) }
 
-  override string getName() {
-    result = comp.getName()
-  }
+  override string getName() { result = comp.getName() }
 
-  override DataFlow::Node getDefinition() {
-    result = comp
-  }
+  override DataFlow::Node getDefinition() { result = comp }
 
   override DataFlow::ValueNode getMemberInit(string name) {
     comp.getConfig().hasPropertyWrite(name, result)
   }
 
-  override Function getALinkFunction() {
-    none()
-  }
-
-  override predicate bindsToController() {
-    none()
-  }
+  override Function getALinkFunction() { none() }
 
-  override predicate hasIsolateScope() {
-    any()
-  }
+  override predicate bindsToController() { none() }
 
-  override DataFlow::SourceNode getAnInstantiation() {
-    result = comp.getConfig()
-  }
+  override predicate hasIsolateScope() { any() }
 
+  override DataFlow::SourceNode getAnInstantiation() { result = comp.getConfig() }
 }
 
-private newtype TDirectiveTargetType = E() or A() or C() or M()
+private newtype TDirectiveTargetType =
+  E() or
+  A() or
+  C() or
+  M()
 
 /**
  * The type of a directive target, indicating whether it is an element ("E"),
@@ -535,9 +481,12 @@ class DirectiveTargetType extends TDirectiveTargetType {
    * Gets a textual representation of this target type.
    */
   string toString() {
-    this = E() and result = "E" or
-    this = A() and result = "A" or
-    this = C() and result = "C" or
+    this = E() and result = "E"
+    or
+    this = A() and result = "A"
+    or
+    this = C() and result = "C"
+    or
     this = M() and result = "M"
   }
 }
@@ -571,9 +520,13 @@ abstract class DirectiveTarget extends Locatable {
  */
 private class DomElementAsElement extends DirectiveTarget {
   DOM::ElementDefinition element;
+
   DomElementAsElement() { this = element }
+
   override string getName() { result = element.getName() }
+
   override DOM::ElementDefinition getElement() { result = element }
+
   override DirectiveTargetType getType() { result = E() }
 }
 
@@ -582,10 +535,15 @@ private class DomElementAsElement extends DirectiveTarget {
  */
 private class DomAttributeAsElement extends DirectiveTarget {
   DOM::AttributeDefinition attr;
+
   DomAttributeAsElement() { this = attr }
+
   override string getName() { result = attr.getName() }
+
   override DOM::ElementDefinition getElement() { result = attr.getElement() }
+
   override DirectiveTargetType getType() { result = A() }
+
   DOM::AttributeDefinition asAttribute() { result = attr }
 }
 
@@ -598,9 +556,7 @@ private class DomAttributeAsElement extends DirectiveTarget {
  * camel case.
  */
 class DirectiveTargetName extends string {
-  DirectiveTargetName() {
-    this = any(DirectiveTarget e).getName()
-  }
+  DirectiveTargetName() { this = any(DirectiveTarget e).getName() }
 
   /**
    * Gets the `i`th component of this name, where `-`,
@@ -614,9 +570,7 @@ class DirectiveTargetName extends string {
    * Holds if the first component of this name is `x` or `data`,
    * and hence should be stripped when normalizing.
    */
-  predicate stripFirstComponent() {
-    getRawComponent(0) = "x" or getRawComponent(0) = "data"
-  }
+  predicate stripFirstComponent() { getRawComponent(0) = "x" or getRawComponent(0) = "data" }
 
   /**
    * Gets the `i`th component of this name after processing:
@@ -624,9 +578,10 @@ class DirectiveTargetName extends string {
    * and all components except the first are capitalized.
    */
   string getProcessedComponent(int i) {
-    exists (int j, string raw |
+    exists(int j, string raw |
       i >= 0 and
-      if stripFirstComponent() then j = i+1 else j = i |
+      if stripFirstComponent() then j = i + 1 else j = i
+    |
       raw = getRawComponent(j) and
       if i = 0 then result = raw else result = capitalize(raw)
     )
@@ -640,7 +595,6 @@ class DirectiveTargetName extends string {
   }
 }
 
-
 /**
  * A call to a getter method of the `$location` service, viewed as a source of
  * user-controlled data.
@@ -652,19 +606,19 @@ class DirectiveTargetName extends string {
  */
 private class LocationFlowSource extends RemoteFlowSource {
   LocationFlowSource() {
-    exists (ServiceReference service, MethodCallExpr mce, string m, int n |
+    exists(ServiceReference service, MethodCallExpr mce, string m, int n |
       service.getName() = "$location" and
       this.asExpr() = mce and
       mce = service.getAMethodCall(m) and
-      n = mce.getNumArgument() |
-      m = "search" and n < 2 or
+      n = mce.getNumArgument()
+    |
+      m = "search" and n < 2
+      or
       m = "hash" and n = 0
     )
   }
 
-  override string getSourceType() {
-    result = "$location"
-  }
+  override string getSourceType() { result = "$location" }
 }
 
 /**
@@ -675,15 +629,13 @@ private class LocationFlowSource extends RemoteFlowSource {
  */
 private class RouteParamSource extends RemoteFlowSource {
   RouteParamSource() {
-    exists (ServiceReference service |
+    exists(ServiceReference service |
       service.getName() = "$routeParams" and
       this = service.getAPropertyAccess(_)
     )
   }
 
-  override string getSourceType() {
-    result = "$routeParams"
-  }
+  override string getSourceType() { result = "$routeParams" }
 }
 
 /**
@@ -691,27 +643,34 @@ private class RouteParamSource extends RemoteFlowSource {
  * The interface may be backed by an actual jQuery implementation.
  */
 private class JQLiteObject extends JQueryObject {
-
   JQLiteObject() {
     this = angular().getAMemberCall("element").asExpr()
     or
     exists(SimpleParameter param |
       // element parameters to user-functions invoked by AngularJS
-      param = any(LinkFunction link).getElementParameter() or
+      param = any(LinkFunction link).getElementParameter()
+      or
       exists(GeneralDirective d |
-        param = d.getCompileFunction().getParameter(0) or
-        exists (DataFlow::FunctionNode f, int i |
-          f.flowsToExpr(d.getCompileFunction().getAReturnedExpr()) and i = 1 or
-          f = d.getMember("template") and i = 0 or
-          f = d.getMember("templateUrl") and i = 0 |
+        param = d.getCompileFunction().getParameter(0)
+        or
+        exists(DataFlow::FunctionNode f, int i |
+          f.flowsToExpr(d.getCompileFunction().getAReturnedExpr()) and i = 1
+          or
+          f = d.getMember("template") and i = 0
+          or
+          f = d.getMember("templateUrl") and i = 0
+        |
           param = f.getAstNode().(Function).getParameter(i)
         )
-      ) |
+      )
+    |
       this = param.getAnInitialUse()
-    ) or
+    )
+    or
     exists(ServiceReference element |
       element.getName() = "$rootElement" or
-      element.getName() = "$document" |
+      element.getName() = "$document"
+    |
       this = element.getAnAccess()
     )
   }
@@ -723,7 +682,6 @@ private class JQLiteObject extends JQueryObject {
  * Used for exposing behavior that is similar to the behavior of other libraries.
  */
 abstract class AngularJSCall extends CallExpr {
-
   /**
    * Holds if `e` is an argument that this call interprets as HTML.
    */
@@ -738,14 +696,12 @@ abstract class AngularJSCall extends CallExpr {
    * Holds if `e` is an argument that this call interprets as code.
    */
   abstract predicate interpretsArgumentAsCode(Expr e);
-
 }
 
 /**
  * A call to a method on the AngularJS object itself.
  */
 private class AngularMethodCall extends AngularJSCall {
-
   MethodCallExpr mce;
 
   AngularMethodCall() {
@@ -758,20 +714,15 @@ private class AngularMethodCall extends AngularJSCall {
     e = mce.getArgument(0)
   }
 
-  override predicate storesArgumentGlobally(Expr e) {
-    none()
-  }
+  override predicate storesArgumentGlobally(Expr e) { none() }
 
-  override predicate interpretsArgumentAsCode(Expr e) {
-    none()
-  }
+  override predicate interpretsArgumentAsCode(Expr e) { none() }
 }
 
 /**
  * A call to a method on a builtin service.
  */
 private class ServiceMethodCall extends AngularJSCall {
-
   MethodCallExpr mce;
 
   ServiceMethodCall() {
@@ -784,12 +735,15 @@ private class ServiceMethodCall extends AngularJSCall {
   override predicate interpretsArgumentAsHtml(Expr e) {
     exists(ServiceReference service, string methodName |
       service.getName() = "$sce" and
-      mce = service.getAMethodCall(methodName) |
+      mce = service.getAMethodCall(methodName)
+    |
       (
         // specialized call
         (methodName = "trustAsHtml" or methodName = "trustAsCss") and
         e = mce.getArgument(0)
-      ) or (
+      )
+      or
+      (
         // generic call with enum argument
         methodName = "trustAs" and
         exists(DataFlow::PropRead prn |
@@ -804,12 +758,15 @@ private class ServiceMethodCall extends AngularJSCall {
   override predicate storesArgumentGlobally(Expr e) {
     exists(ServiceReference service, string serviceName, string methodName |
       service.getName() = serviceName and
-      mce = service.getAMethodCall(methodName) |
-      ( // AngularJS caches (only available during runtime, so similar to sessionStorage)
+      mce = service.getAMethodCall(methodName)
+    |
+      (
+        // AngularJS caches (only available during runtime, so similar to sessionStorage)
         (serviceName = "$cacheFactory" or serviceName = "$templateCache") and
         methodName = "put" and
         e = mce.getArgument(1)
-      ) or
+      )
+      or
       (
         serviceName = "$cookies" and
         (methodName = "put" or methodName = "putObject") and
@@ -826,15 +783,19 @@ private class ServiceMethodCall extends AngularJSCall {
       methodName = "$evalAsync" or
       methodName = "$watch" or
       methodName = "$watchCollection" or
-      methodName = "$watchGroup" |
+      methodName = "$watchGroup"
+    |
       e = scope.getAMethodCall(methodName).getArgument(0)
-    ) or
+    )
+    or
     exists(ServiceReference service |
       service.getName() = "$compile" or
       service.getName() = "$parse" or
-      service.getName() = "$interpolate" |
+      service.getName() = "$interpolate"
+    |
       e = service.getACall().getArgument(0)
-    ) or
+    )
+    or
     exists(ServiceReference service, CallExpr filter, CallExpr filterInvocation |
       // `$filter('orderBy')(collection, expression)`
       service.getName() = "$filter" and
@@ -850,44 +811,32 @@ private class ServiceMethodCall extends AngularJSCall {
  * A link-function used in a custom AngularJS directive.
  */
 class LinkFunction extends Function {
-  LinkFunction() {
-    this = any(GeneralDirective d).getALinkFunction()
-  }
+  LinkFunction() { this = any(GeneralDirective d).getALinkFunction() }
 
   /**
    * Gets the scope parameter of this function.
    */
-  SimpleParameter getScopeParameter() {
-    result = getParameter(0)
-  }
+  SimpleParameter getScopeParameter() { result = getParameter(0) }
 
   /**
    * Gets the element parameter of this function (contains a jqLite-wrapped DOM element).
    */
-  SimpleParameter getElementParameter() {
-    result = getParameter(1)
-  }
+  SimpleParameter getElementParameter() { result = getParameter(1) }
 
   /**
    * Gets the attributes parameter of this function.
    */
-  SimpleParameter getAttributesParameter() {
-    result = getParameter(2)
-  }
+  SimpleParameter getAttributesParameter() { result = getParameter(2) }
 
   /**
    * Gets the controller parameter of this function.
    */
-  SimpleParameter getControllerParameter() {
-    result = getParameter(3)
-  }
+  SimpleParameter getControllerParameter() { result = getParameter(3) }
 
   /**
    * Gets the transclude-function parameter of this function.
    */
-  SimpleParameter getTranscludeFnParameter() {
-    result = getParameter(4)
-  }
+  SimpleParameter getTranscludeFnParameter() { result = getParameter(4) }
 }
 
 /**
@@ -898,19 +847,15 @@ private newtype TAngularScope =
     any(DirectiveInstance d).getAMatchingElement().getFile() = file or
     any(CustomDirective d).getATemplateFile() = file
   } or
-  MkIsolateScope(CustomDirective dir) {
-    dir.hasIsolateScope()
-  } or
+  MkIsolateScope(CustomDirective dir) { dir.hasIsolateScope() } or
   MkElementScope(DOM::ElementDefinition elem) {
     any(DirectiveInstance d | not d.(CustomDirective).hasIsolateScope()).getAMatchingElement() = elem
   }
 
-
 /**
  * An abstract representation of a set of AngularJS scope objects.
  */
 class AngularScope extends TAngularScope {
-
   /** Gets a textual representation of this element. */
   abstract string toString();
 
@@ -918,21 +863,24 @@ class AngularScope extends TAngularScope {
    * Gets an access to this scope object.
    */
   Expr getAnAccess() {
-    exists (CustomDirective d |
-      this = d.getAScope() |
-      exists (SimpleParameter p |
+    exists(CustomDirective d | this = d.getAScope() |
+      exists(SimpleParameter p |
         p = d.getController().getDependencyParameter("$scope") or
-        p = d.getALinkFunction().getParameter(0) |
+        p = d.getALinkFunction().getParameter(0)
+      |
         result.mayReferToParameter(p)
-      ) or
-      exists (DataFlow::ThisNode dis |
+      )
+      or
+      exists(DataFlow::ThisNode dis |
         dis.flowsToExpr(result) and
         dis.getBinder().getAstNode() = d.getController().asFunction() and
         d.bindsToController()
-      ) or
+      )
+      or
       d.hasIsolateScope() and result = d.getMember("scope").asExpr()
-    ) or
-    exists (DirectiveController c, DOM::ElementDefinition elem, SimpleParameter p |
+    )
+    or
+    exists(DirectiveController c, DOM::ElementDefinition elem, SimpleParameter p |
       c.boundTo(elem) and
       this.mayApplyTo(elem) and
       p = c.getFactoryFunction().getDependencyParameter("$scope") and
@@ -944,8 +892,10 @@ class AngularScope extends TAngularScope {
    * Holds if this scope may be the scope object of `elt`, i.e. the value of `angular.element(elt).scope()`.
    */
   predicate mayApplyTo(DOM::ElementDefinition elt) {
-    this = MkIsolateScope(any(CustomDirective d | d.getAMatchingElement() = elt)) or
-    this = MkElementScope(elt) or
+    this = MkIsolateScope(any(CustomDirective d | d.getAMatchingElement() = elt))
+    or
+    this = MkElementScope(elt)
+    or
     this = MkHtmlFileScope(elt.getFile()) and elt instanceof HTML::Element
   }
 }
@@ -954,52 +904,38 @@ class AngularScope extends TAngularScope {
  * An abstract representation of all the AngularJS scope objects in an HTML file.
  */
 class HtmlFileScope extends AngularScope, MkHtmlFileScope {
-
   HTML::HtmlFile f;
 
   HtmlFileScope() { this = MkHtmlFileScope(f) }
 
-  override string toString() {
-    result = "scope in " + f.getBaseName()
-  }
-
+  override string toString() { result = "scope in " + f.getBaseName() }
 }
 
 /**
  * An abstract representation of the AngularJS isolate scope of a directive.
  */
 class IsolateScope extends AngularScope, MkIsolateScope {
-
   CustomDirective dir;
 
   IsolateScope() { this = MkIsolateScope(dir) }
 
-  override string toString() {
-    result = "isolate scope for " + dir.getName()
-  }
+  override string toString() { result = "isolate scope for " + dir.getName() }
 
   /**
    * Gets the directive of this isolate scope.
    */
-  CustomDirective getDirective(){
-    result = dir
-  }
-
+  CustomDirective getDirective() { result = dir }
 }
 
 /**
  * An abstract representation of all the AngularJS scope objects for a DOM element.
  */
 class ElementScope extends AngularScope, MkElementScope {
-
   DOM::ElementDefinition elem;
 
   ElementScope() { this = MkElementScope(elem) }
 
-  override string toString() {
-    result = "scope for " + elem
-  }
-
+  override string toString() { result = "scope for " + elem }
 }
 
 /**
@@ -1010,20 +946,17 @@ class ElementScope extends AngularScope, MkElementScope {
 DataFlow::SourceNode routeProviderRef() {
   result = builtinServiceRef("$routeProvider")
   or
-  exists (string m | m = "when" or m = "otherwise" |
-    result = routeProviderRef().getAMethodCall(m)
-  )
+  exists(string m | m = "when" or m = "otherwise" | result = routeProviderRef().getAMethodCall(m))
 }
 
 /**
  * A setup of an AngularJS "route", using the `$routeProvider` API.
  */
 class RouteSetup extends DataFlow::CallNode, DependencyInjection {
-
   int optionsArgumentIndex;
 
   RouteSetup() {
-    exists (string methodName | this = routeProviderRef().getAMethodCall(methodName) |
+    exists(string methodName | this = routeProviderRef().getAMethodCall(methodName) |
       methodName = "otherwise" and optionsArgumentIndex = 0
       or
       methodName = "when" and optionsArgumentIndex = 1
@@ -1043,26 +976,25 @@ class RouteSetup extends DataFlow::CallNode, DependencyInjection {
   InjectableFunction getController() {
     exists(DataFlow::SourceNode controllerProperty |
       // Note that `.getController` cannot be used here, since that involves a cast to InjectableFunction, and that cast only succeeds because of this method
-      controllerProperty = getRouteParam("controller") |
-      result = controllerProperty or
+      controllerProperty = getRouteParam("controller")
+    |
+      result = controllerProperty
+      or
       exists(ControllerDefinition def |
-        controllerProperty.asExpr().mayHaveStringValue(def.getName()) |
+        controllerProperty.asExpr().mayHaveStringValue(def.getName())
+      |
         result = def.getAService()
       )
     )
   }
 
-  override DataFlow::Node getAnInjectableFunction() {
-    result = getRouteParam("controller")
-  }
-
+  override DataFlow::Node getAnInjectableFunction() { result = getRouteParam("controller") }
 }
 
 /**
  * An AngularJS controller instance.
  */
 abstract class Controller extends DataFlow::Node {
-
   /**
    * Holds if this controller is bound to `elem`.
    */
@@ -1077,22 +1009,18 @@ abstract class Controller extends DataFlow::Node {
    * Gets the factory function of this controller.
    */
   abstract InjectableFunction getFactoryFunction();
-
 }
 
 /**
  * A controller instantiated through a directive, e.g. `<div ngController="myController"/>`.
  */
 private class DirectiveController extends Controller {
-
   ControllerDefinition def;
 
-  DirectiveController() {
-    this = def
-  }
+  DirectiveController() { this = def }
 
   private predicate boundAnonymously(DOM::ElementDefinition elem) {
-    exists (DirectiveInstance instance, DomAttributeAsElement attr |
+    exists(DirectiveInstance instance, DomAttributeAsElement attr |
       instance.getName() = "ngController" and
       instance.getATarget() = attr and
       elem = attr.getElement() and
@@ -1105,42 +1033,35 @@ private class DirectiveController extends Controller {
   }
 
   override predicate boundToAs(DOM::ElementDefinition elem, string alias) {
-    exists (DirectiveInstance instance, DomAttributeAsElement attr |
+    exists(DirectiveInstance instance, DomAttributeAsElement attr |
       instance.getName() = "ngController" and
       instance.getATarget() = attr and
       elem = attr.getElement() and
       exists(string attributeValue, string pattern |
         attributeValue = attr.asAttribute().getStringValue() and
-        pattern = "([^ ]+) +as +([^ ]+)" |
+        pattern = "([^ ]+) +as +([^ ]+)"
+      |
         attributeValue.regexpCapture(pattern, 1) = def.getName() and
         attributeValue.regexpCapture(pattern, 2) = alias
       )
     )
   }
 
-  override InjectableFunction getFactoryFunction() {
-    result = def.getAFactoryFunction()
-  }
-
+  override InjectableFunction getFactoryFunction() { result = def.getAFactoryFunction() }
 }
 
 /**
  * A controller instantiated through routes, e.g. `$routeProvider.otherwise({controller: ...})`.
  */
 private class RouteInstantiatedController extends Controller {
-
   RouteSetup setup;
 
-  RouteInstantiatedController() {
-    this = setup
-  }
+  RouteInstantiatedController() { this = setup }
 
-  override InjectableFunction getFactoryFunction() {
-    result = setup.getController()
-  }
+  override InjectableFunction getFactoryFunction() { result = setup.getController() }
 
   override predicate boundTo(DOM::ElementDefinition elem) {
-    exists (string url, HTML::HtmlFile template |
+    exists(string url, HTML::HtmlFile template |
       setup.getRouteParam("templateUrl").asExpr().mayHaveStringValue(url) and
       template.getAbsolutePath().regexpMatch(".*\\Q" + url + "\\E") and
       elem.getFile() = template
@@ -1151,7 +1072,6 @@ private class RouteInstantiatedController extends Controller {
     boundTo(elem) and
     setup.getRouteParam("controllerAs").asExpr().mayHaveStringValue(name)
   }
-
 }
 
 /**
@@ -1161,8 +1081,9 @@ private class DependencyInjectedArgumentInitializer extends DataFlow::AnalyzedVa
   DataFlow::AnalyzedNode service;
 
   DependencyInjectedArgumentInitializer() {
-    exists (AngularJS::InjectableFunction f, SimpleParameter param,
-            AngularJS::CustomServiceDefinition def |
+    exists(
+      AngularJS::InjectableFunction f, SimpleParameter param, AngularJS::CustomServiceDefinition def
+    |
       astNode = param.getAnInitialUse() and
       def.getServiceReference() = f.getAResolvedDependency(param) and
       service = def.getAService()
diff --git a/javascript/ql/src/semmle/javascript/frameworks/AngularJS/AngularJSExpressions.qll b/javascript/ql/src/semmle/javascript/frameworks/AngularJS/AngularJSExpressions.qll
index e16b5cb768a6..bba31cd872b7 100644
--- a/javascript/ql/src/semmle/javascript/frameworks/AngularJS/AngularJSExpressions.qll
+++ b/javascript/ql/src/semmle/javascript/frameworks/AngularJS/AngularJSExpressions.qll
@@ -5,7 +5,6 @@
  *
  * NOTE: The API of this library is not stable yet and may change in
  *       the future.
- *
  */
 
 import javascript
@@ -14,19 +13,19 @@ import javascript
  * Extensible class for AngularJS expression source providers (e.g. `id="{{myId}}"` of `<div id="{{myId}}" class="left"/>`).
  */
 abstract class NgSourceProvider extends Locatable {
-
   /**
    * Holds if this element provides the source as `src` for an AngularJS expression at the specified location.
    * The location spans column `startcolumn` of line `startline` to
    * column `endcolumn` of line `endline` in file `filepath`.
    */
-  abstract predicate providesSourceAt(string src, string path, int startLine, int startColumn, int endLine, int endColumn);
+  abstract predicate providesSourceAt(
+    string src, string path, int startLine, int startColumn, int endLine, int endColumn
+  );
 
   /**
    * Gets the enclosing element of the provided source.
    */
   abstract DOM::ElementDefinition getEnclosingElement();
-  
 }
 
 /**
@@ -38,46 +37,33 @@ private newtype TNgSource = MkNgSource(NgSourceProvider p)
  * The source of an AngularJS expression.
  */
 class NgSource extends MkNgSource {
-
   NgSourceProvider provider;
 
-  NgSource() {
-    this = MkNgSource(provider)
-  }
+  NgSource() { this = MkNgSource(provider) }
 
   /**
    * Gets the raw text of this source code.
    */
-  string getText() {
-    provider.providesSourceAt(result, _, _, _, _, _)
-  }
+  string getText() { provider.providesSourceAt(result, _, _, _, _, _) }
 
   /**
    * Gets the provider for this source code.
    */
-  NgSourceProvider getProvider() {
-    result = provider
-  }
+  NgSourceProvider getProvider() { result = provider }
 
   /** Gets a textual representation of this element. */
-  string toString() {
-    result = getText()
-  }
-
+  string toString() { result = getText() }
 }
 
 /**
  * Get the regexp that matches the shortest strings wrapped in '{{' and '}}'.
  */
-private string getInterpolatedExpressionPattern() {
-  result = "(?<=\\{\\{).*?(?=\\}\\})"
-}
+private string getInterpolatedExpressionPattern() { result = "(?<=\\{\\{).*?(?=\\}\\})" }
 
 /**
  * AngularJS expression source from HTML text (e.g. `myExpr` of `<div>Some text {{myExpr}} some text</div>`).
  */
 private class HtmlTextNodeAsNgSourceProvider extends NgSourceProvider, HTML::TextNode {
-
   string source;
 
   int offset;
@@ -86,26 +72,26 @@ private class HtmlTextNodeAsNgSourceProvider extends NgSourceProvider, HTML::Tex
     source = getText().regexpFind(getInterpolatedExpressionPattern(), _, offset)
   }
 
-  override predicate providesSourceAt(string src, string path, int startLine, int startColumn, int endLine, int endColumn) {
+  override predicate providesSourceAt(
+    string src, string path, int startLine, int startColumn, int endLine, int endColumn
+  ) {
     src = source and
     getLocation().hasLocationInfo(path, startLine, startColumn, endLine, endColumn) // this is the entire surrounding text element, we could be more precise by counting lines
   }
 
-  override DOM::ElementDefinition getEnclosingElement() {
-    result = getParent()
-  }
-  
+  override DOM::ElementDefinition getEnclosingElement() { result = getParent() }
 }
 
 /**
  * AngularJS expression source from HTML attributes (e.g. `myId` of `<div id="{{myId}}"/>`).
  */
-private abstract class HtmlAttributeAsNgSourceProvider extends NgSourceProvider, HTML::Attribute {
-
-  override predicate providesSourceAt(string src, string path, int startLine, int startColumn, int endLine, int endColumn) {
+abstract private class HtmlAttributeAsNgSourceProvider extends NgSourceProvider, HTML::Attribute {
+  override predicate providesSourceAt(
+    string src, string path, int startLine, int startColumn, int endLine, int endColumn
+  ) {
     src = getSource() and
     getLocation().hasLocationInfo(path, startLine, startColumn - getOffset(), endLine, _) and
-    endColumn = startColumn + src.length()-1
+    endColumn = startColumn + src.length() - 1
   }
 
   /** The source code of the expression. */
@@ -113,18 +99,14 @@ private abstract class HtmlAttributeAsNgSourceProvider extends NgSourceProvider,
 
   /** The offset into the attribute where the expression starts. */
   abstract int getOffset();
-  
-  override DOM::ElementDefinition getEnclosingElement() {
-    result = getElement()
-  }
 
+  override DOM::ElementDefinition getEnclosingElement() { result = getElement() }
 }
 
 /**
  * AngularJS expression sources interpolated with `{{}}` in attributes.
  */
 private class HtmlAttributeAsInterpolatedNgSourceProvider extends HtmlAttributeAsNgSourceProvider {
-
   string source;
 
   int offset;
@@ -134,22 +116,15 @@ private class HtmlAttributeAsInterpolatedNgSourceProvider extends HtmlAttributeA
     not this instanceof HtmlAttributeAsPlainNgSourceProvider
   }
 
-  override string getSource() {
-    result = source
-  }
-
-  override int getOffset() {
-    result = offset
-  }
+  override string getSource() { result = source }
 
+  override int getOffset() { result = offset }
 }
 
-
 /**
  * AngularJS expression sources in attributes.
  */
 private class HtmlAttributeAsPlainNgSourceProvider extends HtmlAttributeAsNgSourceProvider {
-
   HtmlAttributeAsPlainNgSourceProvider() {
     exists(AngularJS::DirectiveInstance d |
       d.getATarget() = this and
@@ -164,50 +139,45 @@ private class HtmlAttributeAsPlainNgSourceProvider extends HtmlAttributeAsNgSour
     )
   }
 
-  override string getSource() {
-    result = getValue()
-  }
-
-  override int getOffset() {
-    result = 0
-  }
+  override string getSource() { result = getValue() }
 
+  override int getOffset() { result = 0 }
 }
 
 /**
  * AngularJS expression sources interpolated with `{{}}` in the `.template` field of an AngularJS directive.
  */
 private class TemplateFieldNgSourceProvider extends NgSourceProvider {
-
   AngularJS::GeneralDirective directive;
 
   string source;
 
   int offset;
 
-
   TemplateFieldNgSourceProvider() {
     this = directive.getMember("template").asExpr() and
-    source = this.(ConstantString).getStringValue().regexpFind(getInterpolatedExpressionPattern(), _, offset)
+    source = this
+          .(ConstantString)
+          .getStringValue()
+          .regexpFind(getInterpolatedExpressionPattern(), _, offset)
   }
 
-  override predicate providesSourceAt(string src, string path, int startLine, int startColumn, int endLine, int endColumn) {
+  override predicate providesSourceAt(
+    string src, string path, int startLine, int startColumn, int endLine, int endColumn
+  ) {
     src = source and
     getLocation().hasLocationInfo(path, startLine, startColumn - offset, endLine, _) and
-    endColumn = startColumn + src.length()-1
-  }
-  
-  override DOM::ElementDefinition getEnclosingElement() {
-    result = directive.getAMatchingElement()
+    endColumn = startColumn + src.length() - 1
   }
 
+  override DOM::ElementDefinition getEnclosingElement() { result = directive.getAMatchingElement() }
 }
 
 /**
  * A token from a tokenized AngularJS expression source.
  */
-abstract class NgToken extends TNgToken { // (only exposed for testability)
-
+abstract class NgToken extends TNgToken {
+  // (only exposed for testability)
   /** Holds if this token starts at `start` of NgSource `src`. */
   abstract predicate at(NgSource src, int start);
 
@@ -244,18 +214,19 @@ abstract class NgToken extends TNgToken { // (only exposed for testability)
    * Gets the index of this token in the list of tokens of the enclosing `NgSource`.
    */
   private int getIndex() {
-    exists (NgSource src, int start | this.at(src, start) |
-      start = rank[result+1](NgToken someToken, int someStart | someToken.at(src, someStart) | someStart)
+    exists(NgSource src, int start | this.at(src, start) |
+      start = rank[result + 1](NgToken someToken, int someStart |
+          someToken.at(src, someStart)
+        |
+          someStart
+        )
     )
   }
 
   /**
    * Gets the successor of this token.
    */
-  NgToken succ() {
-    result.pre() = this
-  }
-
+  NgToken succ() { result.pre() = this }
 }
 
 /**
@@ -264,83 +235,92 @@ abstract class NgToken extends TNgToken { // (only exposed for testability)
  * See https://github.com/angular/angular.js/blob/master/src/ng/parse.js -> Lexer.prototype
  */
 private module Lexer {
-
   /**
    * Base class for lexer tokens.
    *
    * Lexing is done using `regexpFind` on a disjunction of the result of the `getPattern` methods of all token types.
    * This means that tokens defined by `getPattern` should *not* overlap, otherwise `regexpFind` might start skipping tokens.
    */
-  private abstract class NgTokenType extends string {
-    bindingset[this] NgTokenType() { any() }
+  abstract private class NgTokenType extends string {
+    bindingset[this]
+    NgTokenType() { any() }
+
     abstract string getPattern();
   }
 
   private class NgStringTokenType extends NgTokenType {
     NgStringTokenType() { this = "NgStringTokenType" }
+
     override string getPattern() { result = "'(?:\\\\'|[^'])*'|\"(?:\\\\\"|[^\"])*\"" }
   }
 
   private class NgWhitespaceTokenType extends NgTokenType {
     NgWhitespaceTokenType() { this = "NgWhitespaceTokenType" }
+
     override string getPattern() { result = "\\s+" }
   }
 
   private class NgIdentTokenType extends NgTokenType {
     NgIdentTokenType() { this = "NgIdentTokenType" }
+
     override string getPattern() { result = "[A-Za-z$_][\\w$]*" }
   }
 
   private class NgNumberTokenType extends NgTokenType {
     NgNumberTokenType() { this = "NgNumberTokenType" }
+
     override string getPattern() { result = "\\d+(\\.\\d*)?" }
   }
 
   private class NgOtherTokenType extends NgTokenType {
     NgOtherTokenType() { this = "NgOtherTokenType" }
+
     override string getPattern() { result = "[(){}\\[\\].,;:?]" }
   }
 
   private class NgOpTokenType extends NgTokenType {
     NgOpTokenType() { this = "NgOpTokenType" }
+
     override string getPattern() {
       result = concat(string op |
-        op = "===" or
-        op = "!==" or
-        op = "==" or
-        op = "!=" or
-        op = "<=" or
-        op = ">=" or
-        op = "&&" or
-        op = "||" or
-        op = "*" or
-        op = "!" or
-        op = "=" or
-        op = "<" or
-        op = ">" or
-        op = "+" or
-        op = "-" or
-        op = "/" or
-        op = "%" or
-        op = "|" |
-        "\\Q" + op + "\\E", "|" order by op.length() desc) }
+          op = "===" or
+          op = "!==" or
+          op = "==" or
+          op = "!=" or
+          op = "<=" or
+          op = ">=" or
+          op = "&&" or
+          op = "||" or
+          op = "*" or
+          op = "!" or
+          op = "=" or
+          op = "<" or
+          op = ">" or
+          op = "+" or
+          op = "-" or
+          op = "/" or
+          op = "%" or
+          op = "|"
+        |
+          "\\Q" + op + "\\E", "|"
+          order by
+            op.length() desc
+        )
+    }
   }
 
   newtype TNgToken =
-  MkNgToken(NgSource src, int start, NgTokenType tp, string text) {
-    exists(string allTokenTypePattern |
-      allTokenTypePattern =  concat(NgTokenType t, string p | p = t.getPattern() | p, "|") and
-      text = src.getText().regexpFind(allTokenTypePattern, _, start) and
-      text.regexpMatch(tp.getPattern())
-    )
-  }
-
-  private abstract class NgInternalToken extends TNgToken, NgToken {
-
-    override predicate at(NgSource src, int start) {
-      this = MkNgToken(src, start, _, _)
+    MkNgToken(NgSource src, int start, NgTokenType tp, string text) {
+      exists(string allTokenTypePattern |
+        allTokenTypePattern = concat(NgTokenType t, string p | p = t.getPattern() | p, "|") and
+        text = src.getText().regexpFind(allTokenTypePattern, _, start) and
+        text.regexpMatch(tp.getPattern())
+      )
     }
 
+  abstract private class NgInternalToken extends TNgToken, NgToken {
+    override predicate at(NgSource src, int start) { this = MkNgToken(src, start, _, _) }
+
     override string ppKind() {
       exists(string s, string type |
         this = MkNgToken(_, _, type, _) and
@@ -349,55 +329,42 @@ private module Lexer {
       )
     }
 
-    override predicate is(string content){
-      this = MkNgToken(_, _, _, content)
-    }
-
+    override predicate is(string content) { this = MkNgToken(_, _, _, content) }
   }
 
   /**
    * A string token.
    */
   class NgStringToken extends NgInternalToken {
-    NgStringToken() {
-      this = MkNgToken(_, _, any(NgStringTokenType t), _)
-    }
+    NgStringToken() { this = MkNgToken(_, _, any(NgStringTokenType t), _) }
   }
 
   /**
    * A number token.
    */
   class NgNumToken extends NgInternalToken {
-    NgNumToken() {
-      this = MkNgToken(_, _, any(NgNumberTokenType t), _)
-    }
+    NgNumToken() { this = MkNgToken(_, _, any(NgNumberTokenType t), _) }
   }
 
   /**
    * An identifier token.
    */
   class NgIdentToken extends NgInternalToken {
-    NgIdentToken() {
-      this = MkNgToken(_, _, any(NgIdentTokenType t), _)
-    }
+    NgIdentToken() { this = MkNgToken(_, _, any(NgIdentTokenType t), _) }
   }
 
   /**
    * An "other" token.
    */
   class NgOtherToken extends NgInternalToken {
-    NgOtherToken() {
-      this = MkNgToken(_, _, any(NgOtherTokenType t), _)
-    }
+    NgOtherToken() { this = MkNgToken(_, _, any(NgOtherTokenType t), _) }
   }
 
   /**
    * An operator token.
    */
   class NgOpToken extends NgInternalToken {
-    NgOpToken() {
-      this = MkNgToken(_, _, any(NgOpTokenType t), _)
-    }
+    NgOpToken() { this = MkNgToken(_, _, any(NgOpTokenType t), _) }
   }
 }
 private import Lexer
@@ -419,70 +386,57 @@ abstract class NgAstNode extends TNode {
   /**
    * Pretty prints the child nodes.
    */
-  language[monotonicAggregates] string ppChildren() {
+  language[monotonicAggregates]
+  string ppChildren() {
     result = concat(NgAstNode child, int idx |
-      child = getChild(idx) and
-      not child instanceof Empty |
-      child.pp(),
-      " "
-      order by idx)
+        child = getChild(idx) and
+        not child instanceof Empty
+      |
+        child.pp(), " "
+        order by
+          idx
+      )
   }
 
   /** Gets a textual representation of this element. */
-  string toString() {
-    result = pp()
-  }
+  string toString() { result = pp() }
 
   /**
    * Pretty-prints this node.
    */
   abstract string pp();
-
 }
 
 /**
  * The root node of an abstract syntax tree.
  */
 class NgAst extends TNgAst, NgAstNode {
-  override predicate at(NgToken start, NgToken end) {
-    this = TNgAst(start, end, _, _)
-  }
+  override predicate at(NgToken start, NgToken end) { this = TNgAst(start, end, _, _) }
 
   override string pp() {
     exists(string oneTime |
-      (if isOneTime () then oneTime = " <oneTime>" else oneTime = "") and
+      (if isOneTime() then oneTime = " <oneTime>" else oneTime = "") and
       result = "(NgAst:" + oneTime + " " + ppChildren() + ")"
     )
   }
 
-  override NgAstNode getChild(int n) {
-    n = 0 and this = TNgAst(_, _, _, result)
-  }
+  override NgAstNode getChild(int n) { n = 0 and this = TNgAst(_, _, _, result) }
 
   /**
    * Holds if this is a "one time binding" (i.e. ::-prefixed, e.g. `{{::myId}}`).
    */
-  predicate isOneTime() {
-    this = TNgAst(_, _, true, _)
-  }
-
+  predicate isOneTime() { this = TNgAst(_, _, true, _) }
 }
 
 /**
  * An expression-statement node.
  */
 class NgExprStmt extends TNgExprStmt, NgAstNode {
-  override predicate at(NgToken start, NgToken end) {
-    this = TNgExprStmt(start, end, _)
-  }
+  override predicate at(NgToken start, NgToken end) { this = TNgExprStmt(start, end, _) }
 
-  override string pp() {
-    result = "(NgExprStmt: " + ppChildren() + ")"
-  }
+  override string pp() { result = "(NgExprStmt: " + ppChildren() + ")" }
 
-  override NgAstNode getChild(int n) {
-    n = 0 and this = TNgExprStmt(_, _, result)
-  }
+  override NgAstNode getChild(int n) { n = 0 and this = TNgExprStmt(_, _, result) }
 }
 
 /**
@@ -491,39 +445,31 @@ class NgExprStmt extends TNgExprStmt, NgAstNode {
  * Example: `expr | filter1 | filter2 | ...`, the filters are optional (i.e. `Empty`).
  */
 class NgFilterChain extends TNgFilterChain, NgAstNode {
-  override predicate at(NgToken start, NgToken end) {
-    this = TNgFilterChain(start, end, _, _)
-  }
+  override predicate at(NgToken start, NgToken end) { this = TNgFilterChain(start, end, _, _) }
 
-  override string pp() {
-    result = "(NgFilterChain: " + ppChildren() + ")"
-  }
+  override string pp() { result = "(NgFilterChain: " + ppChildren() + ")" }
 
   override NgAstNode getChild(int n) {
-    (n = 0 and result = getExpr()) or
+    (n = 0 and result = getExpr())
+    or
     (n = 1 and result = getFilter())
   }
 
   /**
    * Gets the leading expression of this filter chain.
    */
-  NgExpr getExpr() {
-    this = TNgFilterChain(_, _, result, _)
-  }
+  NgExpr getExpr() { this = TNgFilterChain(_, _, result, _) }
 
   /**
    * Gets the filter of this filter chain.
    */
-  NgFilter getFilter() {
-    this = TNgFilterChain(_, _, _, result)
-  }
-
+  NgFilter getFilter() { this = TNgFilterChain(_, _, _, result) }
 }
 
 /**
  * Super class for `NgFilter` and `Empty`.
  */
-abstract class NgMaybeFilter extends NgAstNode {}
+abstract class NgMaybeFilter extends NgAstNode { }
 
 /**
  * A filter node.
@@ -531,33 +477,25 @@ abstract class NgMaybeFilter extends NgAstNode {}
  * Example: `filter1 ... | filter2`
  */
 class NgFilter extends TNgFilter, NgMaybeFilter {
-  override predicate at(NgToken start, NgToken end) {
-    this = TNgFilter(start, end, _, _)
-  }
+  override predicate at(NgToken start, NgToken end) { this = TNgFilter(start, end, _, _) }
 
-  override string pp() {
-    result = "(NgFilter: " + ppChildren() + ")"
-  }
+  override string pp() { result = "(NgFilter: " + ppChildren() + ")" }
 
   override NgAstNode getChild(int n) {
-    (n = 0 and result = getHeadFilter()) or
+    (n = 0 and result = getHeadFilter())
+    or
     (n = 1 and result = getTailFilter())
   }
 
   /**
    * Gets the successor filter of this filter, if any.
    */
-  NgSingleFilter getHeadFilter() {
-    this = TNgFilter(_, _, result, _)
-  }
+  NgSingleFilter getHeadFilter() { this = TNgFilter(_, _, result, _) }
 
   /**
    * Gets the tail filter of this filter, if any.
    */
-  NgFilter getTailFilter() {
-    this = TNgFilter(_, _, _, result)
-  }
-
+  NgFilter getTailFilter() { this = TNgFilter(_, _, _, result) }
 }
 
 /**
@@ -566,35 +504,30 @@ class NgFilter extends TNgFilter, NgMaybeFilter {
  * Example: `filter1:arg1:arg2`
  */
 class NgSingleFilter extends TNgSingleFilter, NgAstNode {
-  override predicate at(NgToken start, NgToken end) {
-    this = TNgSingleFilter(start, end, _, _)
-  }
+  override predicate at(NgToken start, NgToken end) { this = TNgSingleFilter(start, end, _, _) }
 
   override string pp() {
     exists(string sep |
-      (if forall(NgAstNode child | child = getChild(_) | child instanceof Empty) then sep = "" else sep = " ") and
+      (
+        if forall(NgAstNode child | child = getChild(_) | child instanceof Empty)
+        then sep = ""
+        else sep = " "
+      ) and
       result = "(NgSingleFilter: " + getName() + sep + ppChildren() + ")"
     )
   }
 
-  override NgAstNode getChild(int n) {
-    n = 0 and this = TNgSingleFilter(_, _, _, result)
-  }
+  override NgAstNode getChild(int n) { n = 0 and this = TNgSingleFilter(_, _, _, result) }
 
   /**
    * Gets the name of the referenced filter.
    */
-  string getName() {
-    this = TNgSingleFilter(_, _, result, _)
-  }
+  string getName() { this = TNgSingleFilter(_, _, result, _) }
 
   /**
    * Gets the `i`th argument expression of this filter call.
    */
-  NgExpr getArgument(int i) {
-    result = getChild(0).(NgFilterArgument).getElement(i)
-  }
-
+  NgExpr getArgument(int i) { result = getChild(0).(NgFilterArgument).getElement(i) }
 }
 
 /**
@@ -606,188 +539,129 @@ abstract class NgExpr extends NgAstNode { }
  * A variable reference expression node.
  */
 class NgVarExpr extends TNgVarExpr, NgExpr {
-
   NgIdentToken identifier;
 
-  NgVarExpr() {
-    this = TNgVarExpr(identifier)
-  }
+  NgVarExpr() { this = TNgVarExpr(identifier) }
 
-  override predicate at(NgToken start, NgToken end) {
-    start = end and start = identifier
-  }
+  override predicate at(NgToken start, NgToken end) { start = end and start = identifier }
 
-  override string pp() {
-    result = "(NgVarExpr: " + getName() + ")"
-  }
+  override string pp() { result = "(NgVarExpr: " + getName() + ")" }
 
-  override NgAstNode getChild(int n) {
-    none()
-  }
+  override NgAstNode getChild(int n) { none() }
 
   /**
    * Gets the name of the referenced variable.
    */
-  string getName() {
-    identifier.is(result)
-  }
-
+  string getName() { identifier.is(result) }
 }
 
 /**
  * A dot expression node for looking up a fixed property with a fixed name.
  */
 class NgDotExpr extends TNgDotExpr, NgExpr {
-  override predicate at(NgToken start, NgToken end) {
-    this = TNgDotExpr(start, end, _, _)
-  }
+  override predicate at(NgToken start, NgToken end) { this = TNgDotExpr(start, end, _, _) }
 
-  override string pp() {
-    result = "(NgDotExpr: " + getBase().pp() + "." + getName() + ")"
-  }
+  override string pp() { result = "(NgDotExpr: " + getBase().pp() + "." + getName() + ")" }
 
-  override NgAstNode getChild(int n) {
-    n = 0 and result = getBase()
-  }
+  override NgAstNode getChild(int n) { n = 0 and result = getBase() }
 
   /**
    * Gets the node for the base expression of this expression.
    */
-  NgAstNode getBase() {
-    this = TNgDotExpr(_, _, result, _)
-  }
+  NgAstNode getBase() { this = TNgDotExpr(_, _, result, _) }
 
   /**
    * Gets the name of the property that is looked up.
    */
-  string getName() {
-    this = TNgDotExpr(_, _, _, result)
-  }
-
+  string getName() { this = TNgDotExpr(_, _, _, result) }
 }
 
 /**
  * A call expression node.
  */
 class NgCallExpr extends TNgCallExpr, NgExpr {
-  override predicate at(NgToken start, NgToken end) {
-    this = TNgCallExpr(start, end, _, _)
-  }
+  override predicate at(NgToken start, NgToken end) { this = TNgCallExpr(start, end, _, _) }
 
-  override string pp() {
-    result = "(NgCallExpr: " + ppChildren() + ")"
-  }
+  override string pp() { result = "(NgCallExpr: " + ppChildren() + ")" }
 
   override NgAstNode getChild(int n) {
-    (n = 0 and this = TNgCallExpr(_, _, result, _)) or
+    (n = 0 and this = TNgCallExpr(_, _, result, _))
+    or
     (n = 1 and this = TNgCallExpr(_, _, _, result))
   }
 
   /**
    * Gets the callee expression of this call.
    */
-  NgExpr getCallee() {
-    result = getChild(0)
-  }
+  NgExpr getCallee() { result = getChild(0) }
 
   /**
    * Gets the `i`th argument expression of this call.
    */
-  NgExpr getArgument(int i) {
-    result = getChild(1).(NgConsCallArgument).getElement(i)
-  }
-
+  NgExpr getArgument(int i) { result = getChild(1).(NgConsCallArgument).getElement(i) }
 }
 
-
 /**
  * A string expression node.
  */
 class NgString extends TNgString, NgExpr {
-
   NgStringToken stringToken;
 
-  NgString() {
-    this = TNgString(stringToken)
-  }
+  NgString() { this = TNgString(stringToken) }
 
-  override predicate at(NgToken start, NgToken end) {
-    start = end and start = stringToken
-  }
+  override predicate at(NgToken start, NgToken end) { start = end and start = stringToken }
 
-  override string pp() {
-    result = getRawValue()
-  }
+  override string pp() { result = getRawValue() }
 
-  override NgAstNode getChild(int n) {
-    none()
-  }
+  override NgAstNode getChild(int n) { none() }
 
   /**
    * Gets the raw string value of this expression, including surrounding quotes.
    */
-  string getRawValue() {
-    stringToken.is(result)
-  }
+  string getRawValue() { stringToken.is(result) }
 
   /**
    * Gets the string value of this expression, excluding surrounding quotes.
    */
-  string getStringValue() {
-    result = getRawValue().substring(1, getRawValue().length() - 1)
-  }
+  string getStringValue() { result = getRawValue().substring(1, getRawValue().length() - 1) }
 }
 
 /**
  * A number expression node.
  */
 class NgNumber extends TNgNumber, NgExpr {
-
   NgNumToken numberToken;
 
-  NgNumber() {
-    this = TNgNumber(numberToken)
-  }
+  NgNumber() { this = TNgNumber(numberToken) }
 
-  override predicate at(NgToken start, NgToken end) {
-    start = end and start = numberToken
-  }
-  override string pp() {
-    result = getValue()
-  }
+  override predicate at(NgToken start, NgToken end) { start = end and start = numberToken }
 
-  override NgAstNode getChild(int n) {
-    none()
-  }
+  override string pp() { result = getValue() }
+
+  override NgAstNode getChild(int n) { none() }
 
   /**
    * Gets the number value of this expression.
    */
-  string getValue() {
-    numberToken.is(result)
-  }
-
+  string getValue() { numberToken.is(result) }
 }
 
 /**
  * Super class for `NgFilterArgument` and `Empty`.
  */
-abstract class NgMaybeFilterArgument extends NgAstNode {}
+abstract class NgMaybeFilterArgument extends NgAstNode { }
 
 /**
  * A non-empty cons-list of arguments for a filter.
  */
 class NgFilterArgument extends TNgFilterArgument, NgMaybeFilterArgument {
-  override predicate at(NgToken start, NgToken end) {
-    this = TNgFilterArgument(start, end, _, _)
-  }
+  override predicate at(NgToken start, NgToken end) { this = TNgFilterArgument(start, end, _, _) }
 
-  override string pp() {
-    result = "(NgFilterArgument: " + ppChildren() + ")"
-  }
+  override string pp() { result = "(NgFilterArgument: " + ppChildren() + ")" }
 
   override NgAstNode getChild(int n) {
-    (n = 0 and this = TNgFilterArgument(_, _, result, _)) or
+    (n = 0 and this = TNgFilterArgument(_, _, result, _))
+    or
     (n = 1 and this = TNgFilterArgument(_, _, _, result))
   }
 
@@ -795,33 +669,28 @@ class NgFilterArgument extends TNgFilterArgument, NgMaybeFilterArgument {
    * Gets the `i`th element of this entire cons-list.
    */
   NgExpr getElement(int i) {
-    if i = 0 then
-      result = getChild(0)
-    else
-      result = getChild(1).(NgFilterArgument).getElement(i - 1)
+    if i = 0
+    then result = getChild(0)
+    else result = getChild(1).(NgFilterArgument).getElement(i - 1)
   }
-
 }
 
 /**
  * Super class for `NgConsCallArgument` and `Empty`.
  */
-abstract class NgCallArguments extends NgAstNode {}
+abstract class NgCallArguments extends NgAstNode { }
 
 /**
  * A non-empty cons-list of arguments for a call.
  */
 class NgConsCallArgument extends TNgConsCallArgument, NgCallArguments {
-  override predicate at(NgToken start, NgToken end) {
-    this = TNgConsCallArgument(start, end, _, _)
-  }
+  override predicate at(NgToken start, NgToken end) { this = TNgConsCallArgument(start, end, _, _) }
 
-  override string pp() {
-    result = "(NgConsCallArgument: " + ppChildren() + ")"
-  }
+  override string pp() { result = "(NgConsCallArgument: " + ppChildren() + ")" }
 
   override NgAstNode getChild(int n) {
-    (n = 0 and this = TNgConsCallArgument(_, _, result, _)) or
+    (n = 0 and this = TNgConsCallArgument(_, _, result, _))
+    or
     (n = 1 and this = TNgConsCallArgument(_, _, _, result))
   }
 
@@ -829,10 +698,9 @@ class NgConsCallArgument extends TNgConsCallArgument, NgCallArguments {
    * Gets the `i`th element of this entire cons-list.
    */
   NgExpr getElement(int i) {
-    if i = 0 then
-      result = getChild(0)
-    else
-      result = getChild(1).(NgConsCallArgument).getElement(i - 1)
+    if i = 0
+    then result = getChild(0)
+    else result = getChild(1).(NgConsCallArgument).getElement(i - 1)
   }
 }
 
@@ -840,119 +708,115 @@ class NgConsCallArgument extends TNgConsCallArgument, NgCallArguments {
  * The empty alternative of maybes.
  */
 class Empty extends TNgEmpty, NgMaybeFilter, NgMaybeFilterArgument, NgCallArguments {
-  override predicate at(NgToken start, NgToken end) {
-    start = end and this = TNgEmpty()
-  }
+  override predicate at(NgToken start, NgToken end) { start = end and this = TNgEmpty() }
 
-  override string pp() {
-    result = "<Empty>"
-  }
+  override string pp() { result = "<Empty>" }
 
-  override NgAstNode getChild(int n) {
-    none()
-  }
+  override NgAstNode getChild(int n) { none() }
 }
 
 private module Parser {
-
   /**
    * Parses a `NgFilter` or `Empty`, whichever is possible.
    */
   private NgMaybeFilter maybeFilter(NgToken start, NgToken end) {
-    if start.succ().(NgOpToken).is("|") then
-    result.(NgFilter).at(start.succ().succ(), end) else
-    result.(Empty).at(start, end)
+    if start.succ().(NgOpToken).is("|")
+    then result.(NgFilter).at(start.succ().succ(), end)
+    else result.(Empty).at(start, end)
   }
 
   /**
    * Parses a `NgFilterArgument` or `Empty`, whichever is possible.
    */
   private NgMaybeFilterArgument maybeFilterArgument(NgToken start, NgToken end) {
-    if start.succ().(NgOtherToken).is(":") then
-    result.(NgFilterArgument).at(start.succ().succ(), end) else
-    result.(Empty).at(start, end)
+    if start.succ().(NgOtherToken).is(":")
+    then result.(NgFilterArgument).at(start.succ().succ(), end)
+    else result.(Empty).at(start, end)
   }
 
   /**
    * Parses a the first `NgConsCallArgument` of a call or `Empty`, whichever is possible.
    */
   private NgCallArguments maybeFirstCallArgument(NgToken start, NgToken end) {
-    if start.succ().(NgOtherToken).is(")") then
-    result.(Empty).at(start, end) else
-    result.(NgConsCallArgument).at(start.succ(), end)
+    if start.succ().(NgOtherToken).is(")")
+    then result.(Empty).at(start, end)
+    else result.(NgConsCallArgument).at(start.succ(), end)
   }
 
   /**
    * Parses a the second or later `NgConsCallArgument` of a call or `Empty`, whichever is possible.
    */
   private NgCallArguments maybeCallArgument(NgToken start, NgToken end) {
-    if start.succ().(NgOtherToken).is(",") then
-    result.(NgConsCallArgument).at(start.succ().succ(), end) else
-    result.(Empty).at(start, end)
+    if start.succ().(NgOtherToken).is(",")
+    then result.(NgConsCallArgument).at(start.succ().succ(), end)
+    else result.(Empty).at(start, end)
   }
 
   /**
    * NgAst node types. Associated with a range of tokens.
    */
-  cached newtype TNode =
-  TNgAst(NgToken start, NgToken end, boolean oneTime, NgExprStmt stmt) {
-    not exists(start.pre()) and
-    not exists(end.succ()) and
-    exists(NgToken stmtStart |
-      if (start.(NgOtherToken).is(":") and start.succ().(NgOtherToken).is(":")) then
-      (stmtStart = start.succ().succ() and oneTime = true) else
-      (stmtStart = start and oneTime = false) |
-      stmt.at(stmtStart, end)
-    )
-  } or
-  TNgExprStmt(NgToken start, NgToken end, NgFilterChain c) {
-    c.at(start, end)
-  } or
-  TNgFilterChain(NgToken start, NgToken end, NgExpr e, NgMaybeFilter f) {
-    exists(NgToken mid |
-      e.at(start, mid) and
-      f = maybeFilter(mid, end)
-    )
-  } or
-  TNgSingleFilter(NgToken start, NgToken end, string name, NgMaybeFilterArgument a) {
-    start.(NgIdentToken).is(name) and
-    a = maybeFilterArgument(start, end)
-  } or
-  TNgFilter(NgToken start, NgToken end, NgSingleFilter head, NgMaybeFilter tail) {
-    exists(NgToken endArgs |
-      head.at(start, endArgs) and
-      tail = maybeFilter(endArgs, end)
-    )
-  } or
-  TNgFilterArgument(NgToken start, NgToken end, NgExpr base, NgMaybeFilterArgument a) {
-    exists(NgToken mid |
-      base.at(start, mid) and
-      a = maybeFilterArgument(mid, end)
-    )
-  } or
-  TNgDotExpr(NgToken start, NgIdentToken end, NgExpr base, string name) {
-    base.at(start, end.pre().pre()) and
-    end.pre().(NgOtherToken).is(".") and
-    end.is(name)
-  } or
-  TNgCallExpr(NgToken start, NgOtherToken end, NgExpr base, NgCallArguments a) {
-    exists(NgToken endBase |
-      base.at(start, endBase) and
-      endBase.succ().(NgOtherToken).is("(") and
-      a = maybeFirstCallArgument(endBase.succ(), end.pre()) and
-      end.is(")")
-    )
-  } or
-  TNgConsCallArgument(NgToken start, NgToken end, NgExpr e, NgCallArguments a) {
-    exists(NgToken mid |
-      e.at(start, mid) and
-      a = maybeCallArgument(mid, end)
-    )
-  } or
-  TNgVarExpr(NgIdentToken t) or
-  TNgString(NgStringToken t) or
-  TNgNumber(NgNumToken t) or
-  TNgEmpty()
+  cached
+  newtype TNode =
+    TNgAst(NgToken start, NgToken end, boolean oneTime, NgExprStmt stmt) {
+      not exists(start.pre()) and
+      not exists(end.succ()) and
+      exists(NgToken stmtStart |
+        if (start.(NgOtherToken).is(":") and start.succ().(NgOtherToken).is(":"))
+        then (
+          stmtStart = start.succ().succ() and oneTime = true
+        ) else (
+          stmtStart = start and oneTime = false
+        )
+      |
+        stmt.at(stmtStart, end)
+      )
+    } or
+    TNgExprStmt(NgToken start, NgToken end, NgFilterChain c) { c.at(start, end) } or
+    TNgFilterChain(NgToken start, NgToken end, NgExpr e, NgMaybeFilter f) {
+      exists(NgToken mid |
+        e.at(start, mid) and
+        f = maybeFilter(mid, end)
+      )
+    } or
+    TNgSingleFilter(NgToken start, NgToken end, string name, NgMaybeFilterArgument a) {
+      start.(NgIdentToken).is(name) and
+      a = maybeFilterArgument(start, end)
+    } or
+    TNgFilter(NgToken start, NgToken end, NgSingleFilter head, NgMaybeFilter tail) {
+      exists(NgToken endArgs |
+        head.at(start, endArgs) and
+        tail = maybeFilter(endArgs, end)
+      )
+    } or
+    TNgFilterArgument(NgToken start, NgToken end, NgExpr base, NgMaybeFilterArgument a) {
+      exists(NgToken mid |
+        base.at(start, mid) and
+        a = maybeFilterArgument(mid, end)
+      )
+    } or
+    TNgDotExpr(NgToken start, NgIdentToken end, NgExpr base, string name) {
+      base.at(start, end.pre().pre()) and
+      end.pre().(NgOtherToken).is(".") and
+      end.is(name)
+    } or
+    TNgCallExpr(NgToken start, NgOtherToken end, NgExpr base, NgCallArguments a) {
+      exists(NgToken endBase |
+        base.at(start, endBase) and
+        endBase.succ().(NgOtherToken).is("(") and
+        a = maybeFirstCallArgument(endBase.succ(), end.pre()) and
+        end.is(")")
+      )
+    } or
+    TNgConsCallArgument(NgToken start, NgToken end, NgExpr e, NgCallArguments a) {
+      exists(NgToken mid |
+        e.at(start, mid) and
+        a = maybeCallArgument(mid, end)
+      )
+    } or
+    TNgVarExpr(NgIdentToken t) or
+    TNgString(NgStringToken t) or
+    TNgNumber(NgNumToken t) or
+    TNgEmpty()
 }
 private import Parser
 
@@ -962,32 +826,25 @@ private import Parser
  * Will eventually be a subtype of `DataFlow::Node`.
  */
 class NgDataFlowNode extends TNode {
-
   NgAstNode astNode;
 
-  NgDataFlowNode() {
-    this = astNode
-  }
+  NgDataFlowNode() { this = astNode }
 
   /** Gets the AST node this node corresponds to. */
-  NgAstNode getAstNode() {
-    result = astNode
-  }
+  NgAstNode getAstNode() { result = astNode }
 
   /** Gets a textual representation of this element. */
-  string toString() {
-    result = astNode.toString()
-  }
+  string toString() { result = astNode.toString() }
 
   /**
    * Gets a scope object for this node.
    */
   AngularJS::AngularScope getAScope() {
-    exists (NgToken token, NgSource source |
+    exists(NgToken token, NgSource source |
       astNode.at(token, _) and
-      token.at(source, _) |
+      token.at(source, _)
+    |
       result.mayApplyTo(source.getProvider().getEnclosingElement())
     )
   }
-
-}
\ No newline at end of file
+}
diff --git a/javascript/ql/src/semmle/javascript/frameworks/AngularJS/DependencyInjections.qll b/javascript/ql/src/semmle/javascript/frameworks/AngularJS/DependencyInjections.qll
index ea4a7599ef27..035166f9de2b 100644
--- a/javascript/ql/src/semmle/javascript/frameworks/AngularJS/DependencyInjections.qll
+++ b/javascript/ql/src/semmle/javascript/frameworks/AngularJS/DependencyInjections.qll
@@ -5,45 +5,34 @@
  *
  * NOTE: The API of this library is not stable yet and may change in
  *       the future.
- *
  */
 
 import javascript
-
 private import AngularJS
 private import ServiceDefinitions
 
 /**
  * Holds if `nd` is an `angular.injector()` value
  */
-private DataFlow::CallNode angularInjector() {
-  result = angular().getAMemberCall("injector")
-}
+private DataFlow::CallNode angularInjector() { result = angular().getAMemberCall("injector") }
 
 /**
  * A call to `$angular.injector().invoke(...)`
  */
 class InjectorInvokeCall extends DataFlow::CallNode, DependencyInjection {
-  InjectorInvokeCall() {
-    this = angularInjector().getAMemberCall("invoke")
-  }
-
-  override DataFlow::Node getAnInjectableFunction() {
-    result = getArgument(0)
-  }
+  InjectorInvokeCall() { this = angularInjector().getAMemberCall("invoke") }
 
+  override DataFlow::Node getAnInjectableFunction() { result = getArgument(0) }
 }
 
 /**
  * Base class for expressions that dependency-inject some of their input with AngularJS dependency injection services.
  */
 abstract class DependencyInjection extends DataFlow::ValueNode {
-
   /**
    * Gets a node that will be dependency-injected.
    */
   abstract DataFlow::Node getAnInjectableFunction();
-
 }
 
 /**
@@ -51,7 +40,6 @@ abstract class DependencyInjection extends DataFlow::ValueNode {
  * parameters automatically provided by the AngularJS `$inject` service.
  */
 abstract class InjectableFunction extends DataFlow::ValueNode {
-
   /** Gets the parameter corresponding to dependency `name`. */
   abstract SimpleParameter getDependencyParameter(string name);
 
@@ -63,17 +51,12 @@ abstract class InjectableFunction extends DataFlow::ValueNode {
   /**
    * Gets an ASTNode for the `name` dependency declaration.
    */
-  ASTNode getADependencyDeclaration(string name) {
-    result = getDependencyDeclaration(_, name)
-  }
+  ASTNode getADependencyDeclaration(string name) { result = getDependencyDeclaration(_, name) }
 
   /**
    * Gets the ASTNode for the `i`th dependency declaration.
    */
-  ASTNode getDependencyDeclaration(int i) {
-    result = getDependencyDeclaration(i, _)
-  }
-
+  ASTNode getDependencyDeclaration(int i) { result = getDependencyDeclaration(i, _) }
 
   /** Gets the function underlying this injectable function. */
   abstract Function asFunction();
@@ -102,7 +85,6 @@ abstract class InjectableFunction extends DataFlow::ValueNode {
       result = custom.getAService()
     )
   }
-
 }
 
 /**
@@ -128,13 +110,11 @@ private class FunctionWithImplicitDependencyAnnotation extends InjectableFunctio
 
   override Function asFunction() { result = astNode }
 
-  override ASTNode getAnExplicitDependencyInjection() {
-    none()
-  }
+  override ASTNode getAnExplicitDependencyInjection() { none() }
 }
 
 private DataFlow::PropWrite getAPropertyDependencyInjection(Function function) {
-  exists (DataFlow::FunctionNode ltf |
+  exists(DataFlow::FunctionNode ltf |
     ltf.getAstNode() = function and
     result = ltf.getAPropertyWrite("$inject")
   )
@@ -146,28 +126,26 @@ private DataFlow::PropWrite getAPropertyDependencyInjection(Function function) {
  */
 private class FunctionWithInjectProperty extends InjectableFunction {
   override Function astNode;
+
   DataFlow::ArrayCreationNode dependencies;
 
   FunctionWithInjectProperty() {
     (
-     this.(DataFlow::FunctionNode).flowsTo(any(DependencyInjection d).getAnInjectableFunction()) or
-     exists(FunctionWithExplicitDependencyAnnotation f | f.asFunction() = astNode)
-    )
-    and
-    exists (DataFlow::PropWrite pwn |
+      this.(DataFlow::FunctionNode).flowsTo(any(DependencyInjection d).getAnInjectableFunction()) or
+      exists(FunctionWithExplicitDependencyAnnotation f | f.asFunction() = astNode)
+    ) and
+    exists(DataFlow::PropWrite pwn |
       pwn = getAPropertyDependencyInjection(astNode) and
       pwn.getRhs().getALocalSource() = dependencies
     )
   }
 
   override SimpleParameter getDependencyParameter(string name) {
-    exists (int i | exists(getDependencyDeclaration(i, name)) |
-      result = astNode.getParameter(i)
-    )
+    exists(int i | exists(getDependencyDeclaration(i, name)) | result = astNode.getParameter(i))
   }
 
   override ASTNode getDependencyDeclaration(int i, string name) {
-    exists (DataFlow::ValueNode decl |
+    exists(DataFlow::ValueNode decl |
       decl = dependencies.getElement(i) and
       decl.mayHaveStringValue(name) and
       result = decl.getAstNode()
@@ -186,15 +164,16 @@ private class FunctionWithInjectProperty extends InjectableFunction {
  */
 private class FunctionWithExplicitDependencyAnnotation extends InjectableFunction {
   DataFlow::FunctionNode function;
+
   override ArrayExpr astNode;
 
   FunctionWithExplicitDependencyAnnotation() {
     this.(DataFlow::SourceNode).flowsTo(any(DependencyInjection d).getAnInjectableFunction()) and
-    function.flowsToExpr(astNode.getElement(astNode.getSize()-1))
+    function.flowsToExpr(astNode.getElement(astNode.getSize() - 1))
   }
 
   override SimpleParameter getDependencyParameter(string name) {
-    exists (int i | astNode.getElement(i).mayHaveStringValue(name) |
+    exists(int i | astNode.getElement(i).mayHaveStringValue(name) |
       result = asFunction().getParameter(i)
     )
   }
diff --git a/javascript/ql/src/semmle/javascript/frameworks/AngularJS/ServiceDefinitions.qll b/javascript/ql/src/semmle/javascript/frameworks/AngularJS/ServiceDefinitions.qll
index 93309abf659d..d53ee63bc8eb 100644
--- a/javascript/ql/src/semmle/javascript/frameworks/AngularJS/ServiceDefinitions.qll
+++ b/javascript/ql/src/semmle/javascript/frameworks/AngularJS/ServiceDefinitions.qll
@@ -10,29 +10,24 @@
  *
  * NOTE: The API of this library is not stable yet and may change in
  *       the future.
- *
  */
 
 import javascript
-
 private import AngularJS
 
 /**
  * A reference to a service.
  */
 private newtype TServiceReference =
-MkBuiltinServiceReference(string name) { exists (getBuiltinKind(name)) } or
-MkCustomServiceReference(CustomServiceDefinition service)
+  MkBuiltinServiceReference(string name) { exists(getBuiltinKind(name)) } or
+  MkCustomServiceReference(CustomServiceDefinition service)
 
 /**
  * A reference to a service.
  */
 abstract class ServiceReference extends TServiceReference {
-
   /** Gets a textual representation of this element. */
-  string toString() {
-    result = getName()
-  }
+  string toString() { result = getName() }
 
   /**
    * Gets the name of this reference.
@@ -49,9 +44,7 @@ abstract class ServiceReference extends TServiceReference {
   /**
    * Gets a call that invokes the referenced service.
    */
-  CallExpr getACall() {
-    result.getCallee() = getAnAccess()
-  }
+  CallExpr getACall() { result.getCallee() = getAnAccess() }
 
   /**
    * Gets a method call that invokes method `methodName` on the referenced service.
@@ -73,20 +66,15 @@ abstract class ServiceReference extends TServiceReference {
    * Holds if the service is available for dependency injection.
    */
   abstract predicate isInjectable();
-
 }
 
 /**
  * A reference to a builtin service.
  */
 class BuiltinServiceReference extends ServiceReference, MkBuiltinServiceReference {
-  override string getName() {
-    this = MkBuiltinServiceReference(result)
-  }
+  override string getName() { this = MkBuiltinServiceReference(result) }
 
-  override predicate isInjectable() {
-    any()
-  }
+  override predicate isInjectable() { any() }
 }
 
 /**
@@ -96,32 +84,23 @@ class BuiltinServiceReference extends ServiceReference, MkBuiltinServiceReferenc
  * This predicate can avoid the non-monotonic recursion that `getAnAccess` can cause.
  */
 DataFlow::ParameterNode builtinServiceRef(string serviceName) {
- exists(InjectableFunction f, BuiltinServiceReference service |
-   service.getName() = serviceName and
-   result = DataFlow::parameterNode(f.getDependencyParameter(serviceName))
- )
-
+  exists(InjectableFunction f, BuiltinServiceReference service |
+    service.getName() = serviceName and
+    result = DataFlow::parameterNode(f.getDependencyParameter(serviceName))
+  )
 }
 
 /**
  * A reference to a custom service.
  */
 class CustomServiceReference extends ServiceReference, MkCustomServiceReference {
-
   CustomServiceDefinition def;
 
-  CustomServiceReference() {
-    this = MkCustomServiceReference(def)
-  }
+  CustomServiceReference() { this = MkCustomServiceReference(def) }
 
-  override string getName() {
-    result = def.getName()
-  }
-
-  override predicate isInjectable() {
-    def instanceof RecipeDefinition
-  }
+  override string getName() { result = def.getName() }
 
+  override predicate isInjectable() { def instanceof RecipeDefinition }
 }
 
 /**
@@ -135,9 +114,11 @@ class CustomServiceReference extends ServiceReference, MkCustomServiceReference
  */
 private string getBuiltinKind(string name) {
   // according to https://docs.angularjs.org/api
-  result = "controller-only" and  name = "$scope"
-  or (
-    result = "service" and (
+  result = "controller-only" and name = "$scope"
+  or
+  (
+    result = "service" and
+    (
       // ng
       name = "$anchorScroll" or
       name = "$animate" or
@@ -203,8 +184,11 @@ private string getBuiltinKind(string name) {
       // ngTouch
       name = "$swipe"
     )
-  ) or (
-    result = "provider" and (
+  )
+  or
+  (
+    result = "provider" and
+    (
       // ng
       name = "$anchorScrollProvider" or
       name = "$animateProvider" or
@@ -235,8 +219,11 @@ private string getBuiltinKind(string name) {
       // ngSanitize
       name = "$sanitizeProvider"
     )
-  ) or (
-    result = "type" and (
+  )
+  or
+  (
+    result = "type" and
+    (
       // ng
       name = "$cacheFactory" or
       name = "$compile" or
@@ -252,7 +239,6 @@ private string getBuiltinKind(string name) {
  * `module.controller` or a similar method.
  */
 abstract class CustomServiceDefinition extends DataFlow::Node {
-
   /** Gets a factory function used to create the defined service. */
   abstract DataFlow::SourceNode getAFactoryFunction();
 
@@ -263,44 +249,37 @@ abstract class CustomServiceDefinition extends DataFlow::Node {
   abstract string getName();
 
   /** Gets the reference to the defined service. */
-  ServiceReference getServiceReference() {
-    result = MkCustomServiceReference(this)
-  }
-
+  ServiceReference getServiceReference() { result = MkCustomServiceReference(this) }
 }
 
 /**
  * A definition of a custom AngularJS dependency injection service using a "recipe".
  */
-abstract class RecipeDefinition extends DataFlow::CallNode, CustomServiceDefinition, DependencyInjection {
-
+abstract class RecipeDefinition extends DataFlow::CallNode, CustomServiceDefinition,
+  DependencyInjection {
   string methodName;
 
   string name;
 
   RecipeDefinition() {
     (
-     this = moduleRef(_).getAMethodCall(methodName) or
-     this = builtinServiceRef("$provide").getAMethodCall(methodName)
+      this = moduleRef(_).getAMethodCall(methodName) or
+      this = builtinServiceRef("$provide").getAMethodCall(methodName)
     ) and
     getArgument(0).asExpr().mayHaveStringValue(name)
   }
 
   override string getName() { result = name }
 
-  override DataFlow::SourceNode getAFactoryFunction() {
-    result.flowsTo(getArgument(1))
-  }
+  override DataFlow::SourceNode getAFactoryFunction() { result.flowsTo(getArgument(1)) }
 
   override DataFlow::Node getAnInjectableFunction() {
     methodName != "value" and
     methodName != "constant" and
     result = getAFactoryFunction()
   }
-
 }
 
-
 /**
  * A custom special AngularJS service, defined through
  * `$controllerProvider.register`, `module.filter` or a similar method.
@@ -310,18 +289,18 @@ abstract class RecipeDefinition extends DataFlow::CallNode, CustomServiceDefinit
  * This includes, filters (used in AngularJS expressions) and controllers
  * (used through `ng-controller` directives).
  */
-private abstract class CustomSpecialServiceDefinition extends CustomServiceDefinition, DependencyInjection {
-
-  override DataFlow::Node getAnInjectableFunction() {
-    result = getAFactoryFunction()
-  }
-
+abstract private class CustomSpecialServiceDefinition extends CustomServiceDefinition,
+  DependencyInjection {
+  override DataFlow::Node getAnInjectableFunction() { result = getAFactoryFunction() }
 }
 
 /**
  * Holds if `mce` defines a service of type `moduleMethodName` with name `serviceName` using the `factoryFunction` as the factory function.
  */
-private predicate isCustomServiceDefinitionOnModule(DataFlow::CallNode mce, string moduleMethodName, string serviceName, DataFlow::SourceNode factoryFunction) {
+private predicate isCustomServiceDefinitionOnModule(
+  DataFlow::CallNode mce, string moduleMethodName, string serviceName,
+  DataFlow::SourceNode factoryFunction
+) {
   mce = moduleRef(_).getAMethodCall(moduleMethodName) and
   (
     moduleMethodName = "controller" or
@@ -334,51 +313,50 @@ private predicate isCustomServiceDefinitionOnModule(DataFlow::CallNode mce, stri
   factoryFunction.flowsTo(mce.getArgument(1))
 }
 
-private predicate isCustomServiceDefinitionOnProvider(DataFlow::CallNode mce, string providerName, string providerMethodName, string serviceName, DataFlow::SourceNode factoryFunction) {
+private predicate isCustomServiceDefinitionOnProvider(
+  DataFlow::CallNode mce, string providerName, string providerMethodName, string serviceName,
+  DataFlow::SourceNode factoryFunction
+) {
   mce = builtinServiceRef(providerName).getAMethodCall(providerMethodName) and
-  ((
-    mce.getNumArgument() = 1 and
-    factoryFunction.flowsTo(mce.getOptionArgument(0, serviceName))
-  ) or (
-    mce.getNumArgument() = 2 and
-    mce.getArgument(0).asExpr().mayHaveStringValue(serviceName) and
-    factoryFunction.flowsTo(mce.getArgument(1))
-  ))
+  (
+    (
+      mce.getNumArgument() = 1 and
+      factoryFunction.flowsTo(mce.getOptionArgument(0, serviceName))
+    )
+    or
+    (
+      mce.getNumArgument() = 2 and
+      mce.getArgument(0).asExpr().mayHaveStringValue(serviceName) and
+      factoryFunction.flowsTo(mce.getArgument(1))
+    )
+  )
 }
 
 /**
  * A controller defined with `module.controller` or `$controllerProvider.register`.
  */
 class ControllerDefinition extends CustomSpecialServiceDefinition {
-
   string name;
 
   DataFlow::SourceNode factoryFunction;
 
   ControllerDefinition() {
     isCustomServiceDefinitionOnModule(this, "controller", name, factoryFunction) or
-    isCustomServiceDefinitionOnProvider(this, "$controllerProvider", "register", name, factoryFunction)
-  }
-
-  override string getName() {
-    result = name
+    isCustomServiceDefinitionOnProvider(this, "$controllerProvider", "register", name,
+      factoryFunction)
   }
 
-  override DataFlow::SourceNode getAService() {
-    result = factoryFunction
-  }
+  override string getName() { result = name }
 
-  override DataFlow::SourceNode getAFactoryFunction() {
-    result = factoryFunction
-  }
+  override DataFlow::SourceNode getAService() { result = factoryFunction }
 
+  override DataFlow::SourceNode getAFactoryFunction() { result = factoryFunction }
 }
 
 /**
  * A filter defined with `module.filter` or `$filterProvider.register`.
  */
 class FilterDefinition extends CustomSpecialServiceDefinition {
-
   string name;
 
   DataFlow::SourceNode factoryFunction;
@@ -388,28 +366,22 @@ class FilterDefinition extends CustomSpecialServiceDefinition {
     isCustomServiceDefinitionOnProvider(this, "$filterProvider", "register", name, factoryFunction)
   }
 
-  override string getName() {
-    result = name
-  }
+  override string getName() { result = name }
 
   override DataFlow::SourceNode getAService() {
-    exists (InjectableFunction f |
+    exists(InjectableFunction f |
       f = factoryFunction and
       result.flowsToExpr(f.asFunction().getAReturnedExpr())
     )
   }
 
-  override DataFlow::SourceNode getAFactoryFunction() {
-    result = factoryFunction
-  }
-
+  override DataFlow::SourceNode getAFactoryFunction() { result = factoryFunction }
 }
 
 /**
  * A directive defined with `module.directive` or `$compileProvider.directive`.
  */
 class DirectiveDefinition extends CustomSpecialServiceDefinition {
-
   string name;
 
   DataFlow::SourceNode factoryFunction;
@@ -419,45 +391,37 @@ class DirectiveDefinition extends CustomSpecialServiceDefinition {
     isCustomServiceDefinitionOnProvider(this, "$compileProvider", "directive", name, factoryFunction)
   }
 
-  override string getName() {
-    result = name
-  }
+  override string getName() { result = name }
 
   override DataFlow::SourceNode getAService() {
-    exists (CustomDirective d |
+    exists(CustomDirective d |
       d.getDefinition() = this and
       result = d.getAnInstantiation()
     )
   }
 
-  override DataFlow::SourceNode getAFactoryFunction() {
-    result = factoryFunction
-  }
-
+  override DataFlow::SourceNode getAFactoryFunction() { result = factoryFunction }
 }
 
 private class CustomDirectiveControllerDependencyInjection extends DependencyInjection {
-
   CustomDirectiveControllerDependencyInjection() {
     this instanceof DirectiveDefinition or
     this instanceof ComponentDefinition
   }
 
   override DataFlow::Node getAnInjectableFunction() {
-    exists (CustomDirective d |
+    exists(CustomDirective d |
       d.getDefinition() = this and
       // Note that `.getController` cannot be used here, since that involves a cast to InjectableFunction, and that cast only succeeds because of this method
       result = d.getMember("controller")
     )
   }
-
 }
 
 /**
  * A component defined with `module.component` or `$compileProvider.component`.
  */
 class ComponentDefinition extends CustomSpecialServiceDefinition {
-
   string name;
 
   DataFlow::SourceNode config;
@@ -467,33 +431,25 @@ class ComponentDefinition extends CustomSpecialServiceDefinition {
     isCustomServiceDefinitionOnProvider(this, "$compileProvider", "component", name, config)
   }
 
-  override string getName() {
-    result = name
-  }
+  override string getName() { result = name }
 
   override DataFlow::SourceNode getAService() {
-    exists (CustomDirective d |
+    exists(CustomDirective d |
       d.getDefinition() = this and
       result = d.getAnInstantiation()
     )
   }
 
-  override DataFlow::SourceNode getAFactoryFunction() {
-    none()
-  }
+  override DataFlow::SourceNode getAFactoryFunction() { none() }
 
   /** Gets the configuration object for the defined component. */
-  DataFlow::SourceNode getConfig() {
-    result = config
-  }
-
+  DataFlow::SourceNode getConfig() { result = config }
 }
 
 /**
  * An animation defined with `module.animation` or `$animationProvider.register`.
  */
 class AnimationDefinition extends CustomSpecialServiceDefinition {
-
   string name;
 
   DataFlow::SourceNode factoryFunction;
@@ -503,21 +459,16 @@ class AnimationDefinition extends CustomSpecialServiceDefinition {
     isCustomServiceDefinitionOnProvider(this, "$animateProvider", "register", name, factoryFunction)
   }
 
-  override string getName() {
-    result = name
-  }
+  override string getName() { result = name }
 
   override DataFlow::SourceNode getAService() {
-    exists (InjectableFunction f |
+    exists(InjectableFunction f |
       f = factoryFunction and
       result.flowsToExpr(f.asFunction().getAReturnedExpr())
     )
   }
 
-  override DataFlow::SourceNode getAFactoryFunction() {
-    result = factoryFunction
-  }
-
+  override DataFlow::SourceNode getAFactoryFunction() { result = factoryFunction }
 }
 
 /**
@@ -534,55 +485,41 @@ BuiltinServiceReference getBuiltinServiceOfKind(string kind) {
  * A request for one or more AngularJS services.
  */
 abstract class ServiceRequest extends Expr {
-
   /**
    * Gets the parameter of this request into which `service` is injected.
    */
   abstract SimpleParameter getDependencyParameter(ServiceReference service);
-
 }
 
 /**
  * The request for a scope service in the form of the link-function of a directive.
  */
 private class LinkFunctionWithScopeInjection extends ServiceRequest {
-
-  LinkFunctionWithScopeInjection() {
-    this instanceof LinkFunction
-  }
+  LinkFunctionWithScopeInjection() { this instanceof LinkFunction }
 
   override SimpleParameter getDependencyParameter(ServiceReference service) {
     service instanceof ScopeServiceReference and
     result = this.(LinkFunction).getScopeParameter()
   }
-
 }
 
-
 /**
  * A request for a service, in the form of a dependency-injected function.
  */
 class InjectableFunctionServiceRequest extends ServiceRequest {
-
   InjectableFunction injectedFunction;
 
-  InjectableFunctionServiceRequest() {
-    DataFlow::valueNode(this) = injectedFunction
-  }
+  InjectableFunctionServiceRequest() { DataFlow::valueNode(this) = injectedFunction }
 
   /**
    * Gets the function of this request.
    */
-  InjectableFunction getAnInjectedFunction() {
-    result = injectedFunction
-  }
+  InjectableFunction getAnInjectedFunction() { result = injectedFunction }
 
   /**
    * Gets a name of a requested service.
    */
-  string getAServiceName() {
-    exists(getAnInjectedFunction().getADependencyDeclaration(result))
-  }
+  string getAServiceName() { exists(getAnInjectedFunction().getADependencyDeclaration(result)) }
 
   /**
    * Gets a service with the specified name, relative to this request.
@@ -596,7 +533,6 @@ class InjectableFunctionServiceRequest extends ServiceRequest {
   override SimpleParameter getDependencyParameter(ServiceReference service) {
     service = injectedFunction.getAResolvedDependency(result)
   }
-
 }
 
 private DataFlow::SourceNode getFactoryFunctionResult(RecipeDefinition def) {
@@ -612,16 +548,16 @@ private DataFlow::SourceNode getFactoryFunctionResult(RecipeDefinition def) {
  * `module.factory("name", f)`.
  */
 class FactoryRecipeDefinition extends RecipeDefinition {
-  FactoryRecipeDefinition() {
-    methodName = "factory"
-  }
+  FactoryRecipeDefinition() { methodName = "factory" }
 
   override DataFlow::SourceNode getAService() {
+    /*
+     * The Factory recipe constructs a new service using a function
+     *    with zero or more arguments (these are dependencies on other
+     *      services). The return value of this function is the service
+     *    instance created by this recipe.
+     */
 
-    /* The Factory recipe constructs a new service using a function
-    with zero or more arguments (these are dependencies on other
-      services). The return value of this function is the service
-    instance created by this recipe.  */
     result = getFactoryFunctionResult(this)
   }
 }
@@ -631,37 +567,36 @@ class FactoryRecipeDefinition extends RecipeDefinition {
  * `module.decorator("name", f)`.
  */
 class DecoratorRecipeDefinition extends RecipeDefinition {
-  DecoratorRecipeDefinition() {
-    methodName = "decorator"
-  }
+  DecoratorRecipeDefinition() { methodName = "decorator" }
 
   override DataFlow::SourceNode getAService() {
+    /*
+     * The return value of the function provided to the decorator
+     *    will take place of the service, directive, or filter being
+     *    decorated.
+     */
 
-    /* The return value of the function provided to the decorator
-    will take place of the service, directive, or filter being
-    decorated.*/
     result = getFactoryFunctionResult(this)
   }
 }
 
-
 /**
  * An AngularJS service recipe definition, that is, a method call of the form
  * `module.service("name", f)`.
  */
 class ServiceRecipeDefinition extends RecipeDefinition {
-  ServiceRecipeDefinition() {
-    methodName = "service"
-  }
+  ServiceRecipeDefinition() { methodName = "service" }
 
   override DataFlow::SourceNode getAService() {
-
-    /* The service recipe produces a service just like the Value or
-    Factory recipes, but it does so by invoking a constructor with
-    the new operator. The constructor can take zero or more
-    arguments, which represent dependencies needed by the instance
-    of this type. */
-    exists (InjectableFunction f |
+    /*
+     * The service recipe produces a service just like the Value or
+     *    Factory recipes, but it does so by invoking a constructor with
+     *    the new operator. The constructor can take zero or more
+     *    arguments, which represent dependencies needed by the instance
+     *    of this type.
+     */
+
+    exists(InjectableFunction f |
       f = getAFactoryFunction() and
       result = DataFlow::valueNode(f.asFunction())
     )
@@ -673,13 +608,9 @@ class ServiceRecipeDefinition extends RecipeDefinition {
  * `module.value("name", value)`.
  */
 class ValueRecipeDefinition extends RecipeDefinition {
-  ValueRecipeDefinition() {
-    methodName = "value"
-  }
+  ValueRecipeDefinition() { methodName = "value" }
 
-  override DataFlow::SourceNode getAService() {
-    result = getAFactoryFunction()
-  }
+  override DataFlow::SourceNode getAService() { result = getAFactoryFunction() }
 }
 
 /**
@@ -687,13 +618,9 @@ class ValueRecipeDefinition extends RecipeDefinition {
  * `module.constant("name", "constant value")`.
  */
 class ConstantRecipeDefinition extends RecipeDefinition {
-  ConstantRecipeDefinition() {
-    methodName = "constant"
-  }
+  ConstantRecipeDefinition() { methodName = "constant" }
 
-  override DataFlow::SourceNode getAService() {
-    result = getAFactoryFunction()
-  }
+  override DataFlow::SourceNode getAService() { result = getAFactoryFunction() }
 }
 
 /**
@@ -701,22 +628,19 @@ class ConstantRecipeDefinition extends RecipeDefinition {
  * `module.provider("name", fun)`.
  */
 class ProviderRecipeDefinition extends RecipeDefinition {
-  ProviderRecipeDefinition() {
-    methodName = "provider"
-  }
+  ProviderRecipeDefinition() { methodName = "provider" }
 
-  override string getName(){
-    result = name or result = name + "Provider"
-  }
+  override string getName() { result = name or result = name + "Provider" }
 
   override DataFlow::SourceNode getAService() {
-
-    /* The Provider recipe is syntactically defined as a custom type
-    that implements a $get method. This method is a factory function
-    just like the one we use in the Factory recipe. In fact, if you
-    define a Factory recipe, an empty Provider type with the $get
-    method set to your factory function is automatically created
-    under the hood.  */
+    /*
+     * The Provider recipe is syntactically defined as a custom type
+     *    that implements a $get method. This method is a factory function
+     *    just like the one we use in the Factory recipe. In fact, if you
+     *    define a Factory recipe, an empty Provider type with the $get
+     *    method set to your factory function is automatically created
+     *    under the hood.
+     */
 
     exists(DataFlow::ThisNode thiz, InjectableFunction f |
       f = getAFactoryFunction() and
@@ -724,60 +648,45 @@ class ProviderRecipeDefinition extends RecipeDefinition {
       result = thiz.getAPropertySource("$get")
     )
   }
-
 }
 
 private class ProviderRecipeServiceInjection extends DependencyInjection {
-
-  ProviderRecipeServiceInjection() {
-    this instanceof ProviderRecipeDefinition
-  }
+  ProviderRecipeServiceInjection() { this instanceof ProviderRecipeDefinition }
 
   override DataFlow::Node getAnInjectableFunction() {
     result = this.(ProviderRecipeDefinition).getAService()
   }
-
 }
 
 /**
  * An AngularJS config method definition, that is, a method call of the form
  * `module.config(fun)`.
  */
-class ConfigMethodDefinition extends ModuleApiCall  {
-  ConfigMethodDefinition() {
-    methodName = "config"
-  }
+class ConfigMethodDefinition extends ModuleApiCall {
+  ConfigMethodDefinition() { methodName = "config" }
 
   /**
    * Gets a provided configuration method.
    */
-  InjectableFunction getConfigMethod() {
-    result.(DataFlow::SourceNode).flowsTo(getArgument(0))
-  }
+  InjectableFunction getConfigMethod() { result.(DataFlow::SourceNode).flowsTo(getArgument(0)) }
 }
 
 /**
  * An AngularJS run method definition, that is, a method call of the form
  * `module.run(fun)`.
  */
-class RunMethodDefinition extends ModuleApiCall  {
-  RunMethodDefinition() {
-    methodName = "run"
-  }
+class RunMethodDefinition extends ModuleApiCall {
+  RunMethodDefinition() { methodName = "run" }
 
   /**
    * Gets a provided run method.
    */
-  InjectableFunction getRunMethod() {
-    result.(DataFlow::SourceNode).flowsTo(getArgument(0))
-  }
+  InjectableFunction getRunMethod() { result.(DataFlow::SourceNode).flowsTo(getArgument(0)) }
 }
 
 /**
  * The `$scope` or `$rootScope` service.
  */
 class ScopeServiceReference extends BuiltinServiceReference {
-  ScopeServiceReference() {
-    getName() = "$scope" or getName() = "$rootScope"
-  }
+  ScopeServiceReference() { getName() = "$scope" or getName() = "$rootScope" }
 }
diff --git a/javascript/ql/src/semmle/javascript/frameworks/AsyncPackage.qll b/javascript/ql/src/semmle/javascript/frameworks/AsyncPackage.qll
index a0d96fb2f1e5..c4bf55cc3baa 100644
--- a/javascript/ql/src/semmle/javascript/frameworks/AsyncPackage.qll
+++ b/javascript/ql/src/semmle/javascript/frameworks/AsyncPackage.qll
@@ -1,6 +1,7 @@
 /**
  * Provides classes for working with [async](https://www.npmjs.com/package/async).
  */
+
 import javascript
 
 module AsyncPackage {
@@ -28,37 +29,27 @@ module AsyncPackage {
    * A call to `async.waterfall`.
    */
   class Waterfall extends DataFlow::InvokeNode {
-    Waterfall() {
-      this = member("waterfall").getACall()
-    }
+    Waterfall() { this = member("waterfall").getACall() }
 
     /**
      * Gets the array of tasks, if it can be found.
      */
-    DataFlow::ArrayCreationNode getTaskArray() {
-      result.flowsTo(getArgument(0))
-    }
+    DataFlow::ArrayCreationNode getTaskArray() { result.flowsTo(getArgument(0)) }
 
     /**
      * Gets the callback to invoke after the last task in the array completes.
      */
-    DataFlow::FunctionNode getFinalCallback() {
-      result.flowsTo(getArgument(1))
-    }
+    DataFlow::FunctionNode getFinalCallback() { result.flowsTo(getArgument(1)) }
 
     /**
      * Gets the `n`th task, if it can be found.
      */
-    DataFlow::FunctionNode getTask(int n) {
-      result.flowsTo(getTaskArray().getElement(n))
-    }
+    DataFlow::FunctionNode getTask(int n) { result.flowsTo(getTaskArray().getElement(n)) }
 
     /**
      * Gets the number of tasks.
      */
-    int getNumTasks() {
-      result = strictcount(getTaskArray().getAnElement())
-    }
+    int getNumTasks() { result = strictcount(getTaskArray().getAnElement()) }
   }
 
   /**
@@ -78,11 +69,10 @@ module AsyncPackage {
    */
   private class WaterfallNextTaskCall extends DataFlow::AdditionalPartialInvokeNode {
     Waterfall waterfall;
+
     int n;
 
-    WaterfallNextTaskCall() {
-      this = getLastParameter(waterfall.getTask(n)).getACall()
-    }
+    WaterfallNextTaskCall() { this = getLastParameter(waterfall.getTask(n)).getACall() }
 
     override predicate isPartialArgument(DataFlow::Node callback, DataFlow::Node argument, int index) {
       // Pass results to next task
@@ -140,23 +130,17 @@ module AsyncPackage {
     /**
      * Gets the node holding the collection being iterated over.
      */
-    DataFlow::Node getCollection() {
-      result = getArgument(0)
-    }
+    DataFlow::Node getCollection() { result = getArgument(0) }
 
     /**
      * Gets the node holding the function being called for each element in the collection.
      */
-    DataFlow::Node getIteratorCallback() {
-      result = getArgument(getNumArgument() - 2)
-    }
+    DataFlow::Node getIteratorCallback() { result = getArgument(getNumArgument() - 2) }
 
     /**
      * Gets the node holding the function being invoked after iteration is complete.
      */
-    DataFlow::Node getFinalCallback() { 
-      result = getArgument(getNumArgument() - 1)
-    }
+    DataFlow::Node getFinalCallback() { result = getArgument(getNumArgument() - 1) }
   }
 
   /**
@@ -166,10 +150,11 @@ module AsyncPackage {
    */
   private class IterationInputTaintStep extends TaintTracking::AdditionalTaintStep, IterationCall {
     override predicate step(DataFlow::Node pred, DataFlow::Node succ) {
-      exists (DataFlow::FunctionNode iteratee |
+      exists(DataFlow::FunctionNode iteratee |
         iteratee = getIteratorCallback() and // Require a closure to avoid spurious call/return mismatch.
         pred = getCollection() and
-        succ = iteratee.getParameter(0))
+        succ = iteratee.getParameter(0)
+      )
     }
   }
 
@@ -188,11 +173,12 @@ module AsyncPackage {
     }
 
     override predicate step(DataFlow::Node pred, DataFlow::Node succ) {
-      exists (DataFlow::FunctionNode iteratee, DataFlow::FunctionNode final, int i |
+      exists(DataFlow::FunctionNode iteratee, DataFlow::FunctionNode final, int i |
         iteratee = getIteratorCallback().getALocalSource() and
         final = getFinalCallback() and // Require a closure to avoid spurious call/return mismatch.
         pred = getLastParameter(iteratee).getACall().getArgument(i) and
-        succ = final.getParameter(i))
+        succ = final.getParameter(i)
+      )
     }
   }
 
@@ -204,15 +190,15 @@ module AsyncPackage {
   private class IterationPreserveTaintStep extends TaintTracking::AdditionalTaintStep, IterationCall {
     IterationPreserveTaintStep() {
       name = "sortBy"
-
       // We don't currently include `filter` and `reject` as they could act as sanitizers.
     }
 
     override predicate step(DataFlow::Node pred, DataFlow::Node succ) {
-      exists (DataFlow::FunctionNode final |
+      exists(DataFlow::FunctionNode final |
         final = getFinalCallback() and // Require a closure to avoid spurious call/return mismatch.
         pred = getCollection() and
-        succ = final.getParameter(1))
+        succ = final.getParameter(1)
+      )
     }
   }
 }
diff --git a/javascript/ql/src/semmle/javascript/frameworks/Azure.qll b/javascript/ql/src/semmle/javascript/frameworks/Azure.qll
index 44a6bd3f2fbe..5cfd2c8326dd 100644
--- a/javascript/ql/src/semmle/javascript/frameworks/Azure.qll
+++ b/javascript/ql/src/semmle/javascript/frameworks/Azure.qll
@@ -1,29 +1,27 @@
 /**
  * Provides classes for working with [Azure](https://github.com/Azure/azure-sdk-for-node) applications.
  */
+
 import javascript
 
 module Azure {
-
   /**
    * An expression that is used for authentication at Azure`.
    */
   class Credentials extends CredentialsExpr {
-
     string kind;
 
     Credentials() {
-      exists (CallExpr mce, string methodName |
+      exists(CallExpr mce, string methodName |
         (methodName = "loginWithUsernamePassword" or methodName = "loginWithServicePrincipalSecret") and
-        mce = DataFlow::moduleMember("ms-rest-azure", methodName).getACall().asExpr() |
-        this = mce.getArgument(0) and kind = "user name" or
+        mce = DataFlow::moduleMember("ms-rest-azure", methodName).getACall().asExpr()
+      |
+        this = mce.getArgument(0) and kind = "user name"
+        or
         this = mce.getArgument(1) and kind = "password"
       )
     }
 
-    override string getCredentialsKind() {
-      result = kind
-    }
-
+    override string getCredentialsKind() { result = kind }
   }
-}
\ No newline at end of file
+}
diff --git a/javascript/ql/src/semmle/javascript/frameworks/Babel.qll b/javascript/ql/src/semmle/javascript/frameworks/Babel.qll
index f547fcbe63a4..f76eb3750e97 100644
--- a/javascript/ql/src/semmle/javascript/frameworks/Babel.qll
+++ b/javascript/ql/src/semmle/javascript/frameworks/Babel.qll
@@ -20,9 +20,10 @@ module Babel {
      * Gets the configuration for the plugin with the given name.
      */
     JSONValue getPluginConfig(string pluginName) {
-      exists (JSONArray plugins |
+      exists(JSONArray plugins |
         plugins = getPropValue("plugins") and
-        result = plugins.getElementValue(_) |
+        result = plugins.getElementValue(_)
+      |
         result.(JSONString).getValue() = pluginName
         or
         result.(JSONArray).getElementStringValue(0) = pluginName
@@ -44,9 +45,7 @@ module Babel {
     /**
      * Holds if this configuration applies to `tl`.
      */
-    predicate appliesTo(TopLevel tl) {
-      tl.getFile() = getAContainerInScope()
-    }
+    predicate appliesTo(TopLevel tl) { tl.getFile() = getAContainerInScope() }
   }
 
   /**
@@ -54,36 +53,25 @@ module Babel {
    */
   class Plugin extends JSONValue {
     Config cfg;
+
     string pluginName;
 
-    Plugin() {
-      this = cfg.getPluginConfig(pluginName)
-    }
+    Plugin() { this = cfg.getPluginConfig(pluginName) }
 
     /** Gets the name of the plugin being installed. */
-    string getPluginName() {
-      result = pluginName
-    }
+    string getPluginName() { result = pluginName }
 
     /** Gets the enclosing Babel configuration object. */
-    Config getConfig() {
-      result = cfg
-    }
+    Config getConfig() { result = cfg }
 
     /** Gets the options value passed to the plugin, if any. */
-    JSONValue getOptions() {
-      result = this.(JSONArray).getElementValue(1)
-    }
+    JSONValue getOptions() { result = this.(JSONArray).getElementValue(1) }
 
     /** Gets a named option from the option object, if present. */
-    JSONValue getOption(string name) {
-      result = getOptions().(JSONObject).getPropValue(name)
-    }
+    JSONValue getOption(string name) { result = getOptions().(JSONObject).getPropValue(name) }
 
     /** Holds if this plugin applies to `tl`. */
-    predicate appliesTo(TopLevel tl) {
-      cfg.appliesTo(tl)
-    }
+    predicate appliesTo(TopLevel tl) { cfg.appliesTo(tl) }
   }
 
   /**
@@ -95,9 +83,7 @@ module Babel {
    * specifies a mapping from a path prefix to a root.
    */
   class RootImportConfig extends Plugin {
-    RootImportConfig() {
-      pluginName = "babel-plugin-root-import"
-    }
+    RootImportConfig() { pluginName = "babel-plugin-root-import" }
 
     /**
      * Gets the root specified for the given prefix.
@@ -119,13 +105,13 @@ module Babel {
       result = getOptions() and
       exists(result.getPropValue("rootPathSuffix"))
       or
-      exists (JSONArray pathSpecs |
+      exists(JSONArray pathSpecs |
         // ["babel-plugin-root-import", [ <spec>... ] ]
         pathSpecs = getOptions()
         or
         // ["babel-plugin-root-import", { "paths": [ <spec> ... ] }]
         pathSpecs = getOption("paths")
-        |
+      |
         result = pathSpecs.getElementValue(_)
       )
     }
@@ -134,22 +120,20 @@ module Babel {
      * Gets the (explicitly specified) root for the given prefix.
      */
     private string getExplicitRoot(string prefix) {
-      exists (JSONObject rootPathSpec |
+      exists(JSONObject rootPathSpec |
         rootPathSpec = getARootPathSpec() and
-        result = rootPathSpec.getPropStringValue("rootPathSuffix") |
-        if exists(rootPathSpec.getPropStringValue("rootPathPrefix")) then
-          prefix = rootPathSpec.getPropStringValue("rootPathPrefix")
-        else
-          prefix = "~"
+        result = rootPathSpec.getPropStringValue("rootPathSuffix")
+      |
+        if exists(rootPathSpec.getPropStringValue("rootPathPrefix"))
+        then prefix = rootPathSpec.getPropStringValue("rootPathPrefix")
+        else prefix = "~"
       )
     }
 
     /**
      * Gets the folder in which this configuration is located.
      */
-    Folder getFolder() {
-      result = getFile().getParentContainer()
-    }
+    Folder getFolder() { result = getFile().getParentContainer() }
   }
 
   /**
@@ -157,9 +141,13 @@ module Babel {
    */
   private class BabelRootTransformedPathExpr extends PathExpr, Expr {
     RootImportConfig plugin;
+
     string rawPath;
+
     string prefix;
+
     string mappedPrefix;
+
     string suffix;
 
     BabelRootTransformedPathExpr() {
@@ -172,13 +160,9 @@ module Babel {
     }
 
     /** Gets the configuration that applies to this path. */
-    RootImportConfig getPlugin() {
-      result = plugin
-    }
+    RootImportConfig getPlugin() { result = plugin }
 
-    override string getValue() {
-      result = mappedPrefix + "/" + suffix
-    }
+    override string getValue() { result = mappedPrefix + "/" + suffix }
 
     override Folder getSearchRoot(int priority) {
       priority = 0 and
@@ -192,13 +176,9 @@ module Babel {
   private class BabelRootTransformedPath extends PathString {
     BabelRootTransformedPathExpr pathExpr;
 
-    BabelRootTransformedPath() {
-      this = pathExpr.getValue()
-    }
+    BabelRootTransformedPath() { this = pathExpr.getValue() }
 
-    override Folder getARootFolder() {
-      result = pathExpr.getPlugin().getFolder()
-    }
+    override Folder getARootFolder() { result = pathExpr.getPlugin().getFolder() }
   }
 
   /**
@@ -208,13 +188,9 @@ module Babel {
    * JSX elements.
    */
   class TransformReactJsxConfig extends Plugin {
-    TransformReactJsxConfig() {
-      pluginName = "transform-react-jsx"
-    }
+    TransformReactJsxConfig() { pluginName = "transform-react-jsx" }
 
     /** Gets the name of the variable used to create JSX elements. */
-    string getJsxFactoryVariableName() {
-      result = getOption("pragma").(JSONString).getValue()
-    }
+    string getJsxFactoryVariableName() { result = getOption("pragma").(JSONString).getValue() }
   }
 }
diff --git a/javascript/ql/src/semmle/javascript/frameworks/Bundling.qll b/javascript/ql/src/semmle/javascript/frameworks/Bundling.qll
index 52d96ca1ced1..e56d1db281d6 100644
--- a/javascript/ql/src/semmle/javascript/frameworks/Bundling.qll
+++ b/javascript/ql/src/semmle/javascript/frameworks/Bundling.qll
@@ -31,12 +31,12 @@ import javascript
  */
 predicate isBrowserifyBundle(ObjectExpr oe) {
   // ensure that there is at least one property
-  forex (Property p | p = oe.getAProperty() |
+  forex(Property p | p = oe.getAProperty() |
     // and each property looks like a packed module
     isBrowserifyBundledModule(p)
   ) and
   // the whole object must be passed to the module loader function
-  exists (CallExpr ce | ce.getCallee().getUnderlyingValue() instanceof Function |
+  exists(CallExpr ce | ce.getCallee().getUnderlyingValue() instanceof Function |
     // the module loader function always has three arguments
     ce.getNumArgument() = 3 and
     // the first of which is the bundle
@@ -60,7 +60,7 @@ private predicate isBrowserifyBundledModule(Property p) {
   // the key must be a module id
   isBrowserifyModuleId(p.(ValueProperty).getNameExpr()) and
   // the value must look like a bundled up module
-  exists (ArrayExpr ae | ae = p.getInit() |
+  exists(ArrayExpr ae | ae = p.getInit() |
     // first element must be a function (known as the module factory function)
     isBrowserifyModuleFactoryFunction(ae.getElement(0)) and
     // second element must be an object literal listing dependencies
@@ -80,7 +80,7 @@ private predicate isBrowserifyBundledModule(Property p) {
  * might well change in future, so we don't rely on it
  */
 private predicate isBrowserifyModuleFactoryFunction(FunctionExpr factory) {
-  forex (Parameter parm | parm = factory.getAParameter() |
+  forex(Parameter parm | parm = factory.getAParameter() |
     parm.getName().regexpMatch("require|module|exports|_dereq_")
   )
 }
@@ -90,7 +90,7 @@ private predicate isBrowserifyModuleFactoryFunction(FunctionExpr factory) {
  */
 private predicate isBrowserifyDependencyMap(ObjectExpr deps) {
   // there may be no dependencies, hence `forall` instead of `forex`
-  forall (Property dep | dep = deps.getAProperty() |
+  forall(Property dep | dep = deps.getAProperty() |
     // each key must be a string literal
     dep.(ValueProperty).getNameExpr() instanceof ConstantString and
     // and each value must be a module id
@@ -107,8 +107,8 @@ private predicate isBrowserifyDependencyMap(ObjectExpr deps) {
  * or `webpack_module_template_argument`.
  */
 private predicate isWebpackModule(FunctionExpr m) {
-  forex (Parameter parm | parm = m.getAParameter() |
-    exists (string name | name = parm.getName() |
+  forex(Parameter parm | parm = m.getAParameter() |
+    exists(string name | name = parm.getName() |
       name.regexpMatch("module|exports|.*webpack_require.*|.*webpack_module_template_argument.*")
     )
   )
@@ -140,25 +140,22 @@ private predicate isWebpackModule(FunctionExpr m) {
  */
 predicate isWebpackBundle(ArrayExpr ae) {
   // ensure that there is at least one bundled module
-  isWebpackModule(ae.getAnElement().getUnderlyingValue())
-  and
+  isWebpackModule(ae.getAnElement().getUnderlyingValue()) and
   // furthermore, every element is either
-  forall (Expr elt | elt = ae.getAnElement().getUnderlyingValue() |
+  forall(Expr elt | elt = ae.getAnElement().getUnderlyingValue() |
     // (1) a module
     isWebpackModule(elt)
     or
     // (2) a module template instantiation
-    exists (ArrayExpr inner | inner = elt |
-      forex (Expr innerElt | innerElt = inner.getAnElement() |
-        innerElt instanceof NumberLiteral
-      )
-    ) or
+    exists(ArrayExpr inner | inner = elt |
+      forex(Expr innerElt | innerElt = inner.getAnElement() | innerElt instanceof NumberLiteral)
+    )
+    or
     // (3) a module reference
     elt instanceof NumberLiteral
-  )
-  and
+  ) and
   // the whole array must be passed to a module loader function
-  exists (CallExpr ce | ce.getCallee().getUnderlyingValue() instanceof Function |
+  exists(CallExpr ce | ce.getCallee().getUnderlyingValue() instanceof Function |
     // which is the bundle
     ce.getArgument(0) = ae
   )
@@ -180,11 +177,7 @@ predicate isMultiPartBundle(TopLevel tl) {
  * A comment that starts with '!'. Minifiers avoid removing such comments.
  */
 class ExclamationPointComment extends Comment {
-
-  ExclamationPointComment() {
-    getLine(0).matches("!%")
-  }
-
+  ExclamationPointComment() { getLine(0).matches("!%") }
 }
 
 /**
@@ -192,15 +185,14 @@ class ExclamationPointComment extends Comment {
  */
 Comment getExclamationPointCommentInRun(ExclamationPointComment head) {
   exists(File f |
-    exists (int n |
+    exists(int n |
       head.onLines(f, n, _) and
-      not exists (ExclamationPointComment d |
-        d.onLines(f, _, n - 1)
-      )
+      not exists(ExclamationPointComment d | d.onLines(f, _, n - 1))
     ) and
-    ( result = head
+    (
+      result = head
       or
-      exists (ExclamationPointComment prev, int n |
+      exists(ExclamationPointComment prev, int n |
         prev = getExclamationPointCommentInRun(head) and
         prev.onLines(f, _, n) and
         result.onLines(f, n + 1, _)
@@ -225,26 +217,29 @@ predicate isMultiLicenseBundle(TopLevel tl) {
   // case: ordinary block comments lines that start with a license
   count(BlockComment head |
     head.getTopLevel() = tl and
-    head.getLine(_).regexpMatch("(?i)[\\s*]*(@license\\b.*|The [a-z0-9-]+ License (\\([a-z0-9-]+\\))?\\s*)")
+    head
+        .getLine(_)
+        .regexpMatch("(?i)[\\s*]*(@license\\b.*|The [a-z0-9-]+ License (\\([a-z0-9-]+\\))?\\s*)")
   ) > 1
 }
 
 /**
  * Holds if this is a bundle with a "bundle" directive.
  */
-predicate isDirectiveBundle(TopLevel tl) {
-  exists (BundleDirective d | d.getTopLevel() = tl)
-}
+predicate isDirectiveBundle(TopLevel tl) { exists(BundleDirective d | d.getTopLevel() = tl) }
 
 /**
  * Holds if toplevel `tl` contains code that looks like the output of a module bundler.
  */
 predicate isBundle(TopLevel tl) {
-  exists (Expr e | e.getTopLevel() = tl |
+  exists(Expr e | e.getTopLevel() = tl |
     isBrowserifyBundle(e) or
     isWebpackBundle(e)
-  ) or
-  isMultiPartBundle(tl) or
-  isMultiLicenseBundle(tl) or
+  )
+  or
+  isMultiPartBundle(tl)
+  or
+  isMultiLicenseBundle(tl)
+  or
   isDirectiveBundle(tl)
 }
diff --git a/javascript/ql/src/semmle/javascript/frameworks/ClientRequests.qll b/javascript/ql/src/semmle/javascript/frameworks/ClientRequests.qll
index ee62d6035fc1..f499880f38e4 100644
--- a/javascript/ql/src/semmle/javascript/frameworks/ClientRequests.qll
+++ b/javascript/ql/src/semmle/javascript/frameworks/ClientRequests.qll
@@ -15,7 +15,6 @@ import javascript
  * contribute to the `data`.
  */
 abstract class CustomClientRequest extends DataFlow::InvokeNode {
-
   /**
    * Gets the URL of the request.
    */
@@ -30,7 +29,6 @@ abstract class CustomClientRequest extends DataFlow::InvokeNode {
    * Gets a node that contributes to the data-part this request.
    */
   abstract DataFlow::Node getADataNode();
-
 }
 
 /**
@@ -41,42 +39,30 @@ abstract class CustomClientRequest extends DataFlow::InvokeNode {
  * contribute to the `data`.
  */
 class ClientRequest extends DataFlow::InvokeNode {
-
   CustomClientRequest custom;
 
-  ClientRequest() {
-    this = custom
-  }
+  ClientRequest() { this = custom }
 
   /**
    * Gets the URL of the request.
    */
-  DataFlow::Node getUrl() {
-    result = custom.getUrl()
-  }
+  DataFlow::Node getUrl() { result = custom.getUrl() }
 
   /**
    * Gets the host of the request.
    */
-  DataFlow::Node getHost() {
-    result = custom.getHost()
-  }
+  DataFlow::Node getHost() { result = custom.getHost() }
 
   /**
    * Gets a node that contributes to the data-part this request.
    */
-  DataFlow::Node getADataNode() {
-    result = custom.getADataNode()
-  }
-
+  DataFlow::Node getADataNode() { result = custom.getADataNode() }
 }
 
 /**
  * Gets name of an HTTP request method, in all-lowercase.
  */
-private string httpMethodName() {
-  result = any(HTTP::RequestMethodName m).toLowerCase()
-}
+private string httpMethodName() { result = any(HTTP::RequestMethodName m).toLowerCase() }
 
 /**
  * Gets the name of a property that likely contains a URL value.
@@ -90,12 +76,10 @@ private string urlPropertyName() {
  * A model of a URL request made using the `request` library.
  */
 private class RequestUrlRequest extends CustomClientRequest {
-
   DataFlow::Node url;
 
   RequestUrlRequest() {
-    exists (string moduleName, DataFlow::SourceNode callee |
-      this = callee.getACall() |
+    exists(string moduleName, DataFlow::SourceNode callee | this = callee.getACall() |
       (
         moduleName = "request" or
         moduleName = "request-promise" or
@@ -114,37 +98,32 @@ private class RequestUrlRequest extends CustomClientRequest {
     result = getOptionArgument(0, urlPropertyName())
   }
 
-  override DataFlow::Node getHost() {
-    none()
-  }
-
-  override DataFlow::Node getADataNode() {
-    result = getArgument(1)
-  }
+  override DataFlow::Node getHost() { none() }
 
+  override DataFlow::Node getADataNode() { result = getArgument(1) }
 }
 
 /**
  * A model of a URL request made using the `axios` library.
  */
 private class AxiosUrlRequest extends CustomClientRequest {
-
   string method;
 
   AxiosUrlRequest() {
-    exists (string moduleName, DataFlow::SourceNode callee |
-      this = callee.getACall() |
+    exists(string moduleName, DataFlow::SourceNode callee | this = callee.getACall() |
       moduleName = "axios" and
       (
-        callee = DataFlow::moduleImport(moduleName) and method = "request" or
-        callee = DataFlow::moduleMember(moduleName, method) and (method = httpMethodName() or method = "request")
+        callee = DataFlow::moduleImport(moduleName) and method = "request"
+        or
+        callee = DataFlow::moduleMember(moduleName, method) and
+        (method = httpMethodName() or method = "request")
       )
     )
   }
 
   private DataFlow::Node getOptionArgument(string name) {
     // depends on the method name and the call arity, over-approximating slightly in the name of simplicity
-    result = getOptionArgument([0..2], name)
+    result = getOptionArgument([0 .. 2], name)
   }
 
   override DataFlow::Node getUrl() {
@@ -152,9 +131,7 @@ private class AxiosUrlRequest extends CustomClientRequest {
     result = getOptionArgument(urlPropertyName())
   }
 
-  override DataFlow::Node getHost() {
-    result = getOptionArgument("host")
-  }
+  override DataFlow::Node getHost() { result = getOptionArgument("host") }
 
   override DataFlow::Node getADataNode() {
     method = "request" and
@@ -163,24 +140,20 @@ private class AxiosUrlRequest extends CustomClientRequest {
     (method = "post" or method = "put" or method = "put") and
     (result = getArgument(1) or result = getOptionArgument(2, "data"))
     or
-    exists (string name |
-      name = "headers" or name = "params"|
-      result = getOptionArgument([0..2], name)
+    exists(string name | name = "headers" or name = "params" |
+      result = getOptionArgument([0 .. 2], name)
     )
   }
-
 }
 
 /**
  * A model of a URL request made using an implementation of the `fetch` API.
  */
 private class FetchUrlRequest extends CustomClientRequest {
-
   DataFlow::Node url;
 
   FetchUrlRequest() {
-    exists (string moduleName, DataFlow::SourceNode callee |
-      this = callee.getACall() |
+    exists(string moduleName, DataFlow::SourceNode callee | this = callee.getACall() |
       (
         moduleName = "node-fetch" or
         moduleName = "cross-fetch" or
@@ -196,29 +169,21 @@ private class FetchUrlRequest extends CustomClientRequest {
     )
   }
 
-  override DataFlow::Node getUrl() {
-    result = url
-  }
+  override DataFlow::Node getUrl() { result = url }
 
   override DataFlow::Node getHost() { none() }
 
   override DataFlow::Node getADataNode() {
-    exists (string name |
-      name = "headers" or name = "body" |
-      result = getOptionArgument(1, name)
-    )
+    exists(string name | name = "headers" or name = "body" | result = getOptionArgument(1, name))
   }
-
 }
 
 /**
  * A model of a URL request made using the `got` library.
  */
 private class GotUrlRequest extends CustomClientRequest {
-
   GotUrlRequest() {
-    exists (string moduleName, DataFlow::SourceNode callee |
-      this = callee.getACall() |
+    exists(string moduleName, DataFlow::SourceNode callee | this = callee.getACall() |
       moduleName = "got" and
       (
         callee = DataFlow::moduleImport(moduleName) or
@@ -229,55 +194,48 @@ private class GotUrlRequest extends CustomClientRequest {
 
   override DataFlow::Node getUrl() {
     result = getArgument(0) and
-    not exists (getOptionArgument(1, "baseUrl"))
+    not exists(getOptionArgument(1, "baseUrl"))
   }
 
   override DataFlow::Node getHost() {
-    exists (string name |
+    exists(string name |
       name = "host" or
-      name = "hostname" |
+      name = "hostname"
+    |
       result = getOptionArgument(1, name)
     )
   }
 
   override DataFlow::Node getADataNode() {
-    exists (string name |
-      name = "headers" or name = "body" or name = "query" |
+    exists(string name | name = "headers" or name = "body" or name = "query" |
       result = getOptionArgument(1, name)
     )
   }
-
 }
 
 /**
  * A model of a URL request made using the `superagent` library.
  */
 private class SuperAgentUrlRequest extends CustomClientRequest {
-
   DataFlow::Node url;
 
   SuperAgentUrlRequest() {
-    exists (string moduleName, DataFlow::SourceNode callee |
-      this = callee.getACall() |
+    exists(string moduleName, DataFlow::SourceNode callee | this = callee.getACall() |
       moduleName = "superagent" and
       callee = DataFlow::moduleMember(moduleName, httpMethodName()) and
       url = getArgument(0)
     )
   }
 
-  override DataFlow::Node getUrl() {
-    result = url
-  }
+  override DataFlow::Node getUrl() { result = url }
 
   override DataFlow::Node getHost() { none() }
 
   override DataFlow::Node getADataNode() {
-    exists (string name |
-      name = "set" or name = "send" or name = "query" |
+    exists(string name | name = "set" or name = "send" or name = "query" |
       result = this.getAChainedMethodCall(name).getAnArgument()
     )
   }
-
 }
 
 /**
@@ -289,5 +247,6 @@ private class XMLHttpRequest extends CustomClientRequest {
   override DataFlow::Node getUrl() { result = getAMethodCall("open").getArgument(1) }
 
   override DataFlow::Node getHost() { none() }
+
   override DataFlow::Node getADataNode() { result = getAMethodCall("send").getArgument(0) }
 }
diff --git a/javascript/ql/src/semmle/javascript/frameworks/ComposedFunctions.qll b/javascript/ql/src/semmle/javascript/frameworks/ComposedFunctions.qll
index 70a088a23738..4885e9b6512d 100644
--- a/javascript/ql/src/semmle/javascript/frameworks/ComposedFunctions.qll
+++ b/javascript/ql/src/semmle/javascript/frameworks/ComposedFunctions.qll
@@ -1,36 +1,34 @@
 /**
  * Provides classes for reasoning about composed functions.
  */
+
 import javascript
 
 /**
  * A function composed from a collection of functions.
  */
 private class ComposedFunction extends DataFlow::CallNode {
-
   ComposedFunction() {
-      exists (string name |
-        name = "just-compose" or
-        name = "compose-function" |
-        this = DataFlow::moduleImport(name).getACall()
-      ) or
-      this = LodashUnderscore::member("flow").getACall()
+    exists(string name |
+      name = "just-compose" or
+      name = "compose-function"
+    |
+      this = DataFlow::moduleImport(name).getACall()
+    )
+    or
+    this = LodashUnderscore::member("flow").getACall()
   }
 
   /**
    * Gets the ith function in this composition.
    */
-  DataFlow::FunctionNode getFunction(int i) {
-    result.flowsTo(getArgument(i))
-  }
-
+  DataFlow::FunctionNode getFunction(int i) { result.flowsTo(getArgument(i)) }
 }
 
 /**
  * A taint step for a composed function.
  */
 private class ComposedFunctionTaintStep extends TaintTracking::AdditionalTaintStep {
-
   ComposedFunction composed;
 
   DataFlow::CallNode call;
@@ -41,27 +39,25 @@ private class ComposedFunctionTaintStep extends TaintTracking::AdditionalTaintSt
   }
 
   override predicate step(DataFlow::Node pred, DataFlow::Node succ) {
-    exists (int fnIndex, DataFlow::FunctionNode fn |
-      fn = composed.getFunction(fnIndex) |
+    exists(int fnIndex, DataFlow::FunctionNode fn | fn = composed.getFunction(fnIndex) |
       // flow out of the composed call
       fnIndex = composed.getNumArgument() - 1 and
       pred = fn.getAReturn() and
       succ = this
       or
-      if fnIndex = 0 then
+      if fnIndex = 0
+      then
         // flow into the first composed function
-        exists (int callArgIndex |
+        exists(int callArgIndex |
           pred = call.getArgument(callArgIndex) and
           succ = fn.getParameter(callArgIndex)
         )
       else
         // flow through the composed functions
-        exists (DataFlow::FunctionNode predFn |
-          predFn = composed.getFunction(fnIndex - 1) |
+        exists(DataFlow::FunctionNode predFn | predFn = composed.getFunction(fnIndex - 1) |
           pred = predFn.getAReturn() and
           succ = fn.getParameter(0)
         )
     )
   }
-
 }
diff --git a/javascript/ql/src/semmle/javascript/frameworks/Connect.qll b/javascript/ql/src/semmle/javascript/frameworks/Connect.qll
index 03a1d7953ad7..3dcac8ab62b1 100644
--- a/javascript/ql/src/semmle/javascript/frameworks/Connect.qll
+++ b/javascript/ql/src/semmle/javascript/frameworks/Connect.qll
@@ -1,6 +1,7 @@
 /**
  * Provides classes for working with [Connect](https://github.com/senchalabs/connect) applications.
  */
+
 import javascript
 import semmle.javascript.frameworks.HTTP
 private import semmle.javascript.frameworks.ConnectExpressShared::ConnectExpressShared
@@ -24,7 +25,6 @@ module Connect {
    * additional subclasses of this class.
    */
   abstract class RouteHandler extends HTTP::Servers::StandardRouteHandler, DataFlow::ValueNode {
-
     /**
      * Gets the parameter of kind `kind` of this route handler.
      *
@@ -35,16 +35,12 @@ module Connect {
     /**
      * Gets the parameter of the route handler that contains the request object.
      */
-    SimpleParameter getRequestParameter() {
-      result = getRouteHandlerParameter("request")
-    }
+    SimpleParameter getRequestParameter() { result = getRouteHandlerParameter("request") }
 
     /**
      * Gets the parameter of the route handler that contains the response object.
      */
-    SimpleParameter getResponseParameter() {
-      result = getRouteHandlerParameter("response")
-    }
+    SimpleParameter getResponseParameter() { result = getRouteHandlerParameter("response") }
   }
 
   /**
@@ -53,14 +49,11 @@ module Connect {
   class StandardRouteHandler extends RouteHandler {
     override Function astNode;
 
-    StandardRouteHandler() {
-      this = any(RouteSetup setup).getARouteHandler()
-    }
+    StandardRouteHandler() { this = any(RouteSetup setup).getARouteHandler() }
 
     override SimpleParameter getRouteHandlerParameter(string kind) {
       result = getRouteHandlerParameter(astNode, kind)
     }
-
   }
 
   /**
@@ -70,16 +63,12 @@ module Connect {
   private class ResponseSource extends HTTP::Servers::ResponseSource {
     RouteHandler rh;
 
-    ResponseSource() {
-      this = DataFlow::parameterNode(rh.getResponseParameter())
-    }
+    ResponseSource() { this = DataFlow::parameterNode(rh.getResponseParameter()) }
 
     /**
      * Gets the route handler that provides this response.
      */
-    override RouteHandler getRouteHandler() {
-      result = rh
-    }
+    override RouteHandler getRouteHandler() { result = rh }
   }
 
   /**
@@ -89,16 +78,12 @@ module Connect {
   private class RequestSource extends HTTP::Servers::RequestSource {
     RouteHandler rh;
 
-    RequestSource() {
-      this = DataFlow::parameterNode(rh.getRequestParameter())
-    }
+    RequestSource() { this = DataFlow::parameterNode(rh.getRequestParameter()) }
 
     /**
      * Gets the route handler that handles this request.
      */
-    override RouteHandler getRouteHandler() {
-      result = rh
-    }
+    override RouteHandler getRouteHandler() { result = rh }
   }
 
   /**
@@ -125,11 +110,11 @@ module Connect {
       getMethodName() = "use" and
       (
         // app.use(fun)
-        server.flowsTo(getReceiver()) or
+        server.flowsTo(getReceiver())
+        or
         // app.use(...).use(fun)
         this.getReceiver().(RouteSetup).getServer() = server
       )
-
     }
 
     override DataFlow::SourceNode getARouteHandler() {
@@ -137,35 +122,28 @@ module Connect {
       result.(DataFlow::TrackedNode).flowsTo(getARouteHandlerExpr().flow())
     }
 
-    override Expr getServer() {
-      result = server
-    }
+    override Expr getServer() { result = server }
 
     /** Gets an argument that represents a route handler being registered. */
-    Expr getARouteHandlerExpr() {
-      result = getAnArgument()
-    }
-
+    Expr getARouteHandlerExpr() { result = getAnArgument() }
   }
 
   /** An expression that is passed as `basicAuthConnect(<user>, <password>)`. */
   class Credentials extends CredentialsExpr {
-
     string kind;
 
     Credentials() {
-      exists (CallExpr call |
+      exists(CallExpr call |
         call = DataFlow::moduleImport("basic-auth-connect").getAnInvocation().asExpr() and
-        call.getNumArgument() = 2 |
-        this = call.getArgument(0) and kind = "user name" or
+        call.getNumArgument() = 2
+      |
+        this = call.getArgument(0) and kind = "user name"
+        or
         this = call.getArgument(1) and kind = "password"
       )
     }
 
-    override string getCredentialsKind() {
-      result = kind
-    }
-
+    override string getCredentialsKind() { result = kind }
   }
 
   /**
@@ -173,10 +151,11 @@ module Connect {
    */
   private class RequestInputAccess extends HTTP::RequestInputAccess {
     RequestExpr request;
+
     string kind;
 
     RequestInputAccess() {
-      exists (PropAccess cookies |
+      exists(PropAccess cookies |
         // `req.cookies.get(<name>)`
         kind = "cookie" and
         cookies.accesses(request, "cookies") and
@@ -184,31 +163,23 @@ module Connect {
       )
     }
 
-    override RouteHandler getRouteHandler() {
-      result = request.getRouteHandler()
-    }
+    override RouteHandler getRouteHandler() { result = request.getRouteHandler() }
 
-    override string getKind() {
-      result = kind
-    }
+    override string getKind() { result = kind }
   }
 
   /**
    * Tracking for `RouteHandlerCandidate`.
    */
   private class TrackedRouteHandlerCandidate extends DataFlow::TrackedNode {
-
-    TrackedRouteHandlerCandidate() {
-      this instanceof RouteHandlerCandidate
-    }
-
+    TrackedRouteHandlerCandidate() { this instanceof RouteHandlerCandidate }
   }
 
   /**
    * A function that looks like a Connect route handler and flows to a route setup.
    */
-  private class TrackedRouteHandlerCandidateWithSetup extends RouteHandler, HTTP::Servers::StandardRouteHandler, DataFlow::ValueNode {
-
+  private class TrackedRouteHandlerCandidateWithSetup extends RouteHandler,
+    HTTP::Servers::StandardRouteHandler, DataFlow::ValueNode {
     override Function astNode;
 
     TrackedRouteHandlerCandidateWithSetup() {
@@ -221,7 +192,6 @@ module Connect {
     override SimpleParameter getRouteHandlerParameter(string kind) {
       result = getRouteHandlerParameter(astNode, kind)
     }
-
   }
 
   /**
@@ -231,7 +201,6 @@ module Connect {
    * it is unknown if `router` is a Connect router.
    */
   class RouteSetupCandidate extends HTTP::RouteSetupCandidate, DataFlow::MethodCallNode {
-
     DataFlow::ValueNode routeHandlerArg;
 
     RouteSetupCandidate() {
@@ -239,9 +208,6 @@ module Connect {
       routeHandlerArg = getAnArgument()
     }
 
-    override DataFlow::ValueNode getARouteHandlerArg() {
-      result = routeHandlerArg
-    }
+    override DataFlow::ValueNode getARouteHandlerArg() { result = routeHandlerArg }
   }
-
 }
diff --git a/javascript/ql/src/semmle/javascript/frameworks/ConnectExpressShared.qll b/javascript/ql/src/semmle/javascript/frameworks/ConnectExpressShared.qll
index 618a140d7dc1..5b73647163eb 100644
--- a/javascript/ql/src/semmle/javascript/frameworks/ConnectExpressShared.qll
+++ b/javascript/ql/src/semmle/javascript/frameworks/ConnectExpressShared.qll
@@ -7,16 +7,16 @@
 import javascript
 
 module ConnectExpressShared {
-
   /**
    * Gets the parameter of kind `kind` of a Connect/Express route handler function.
    *
    * `kind` is one of: "error", "request", "response", "next".
    */
   SimpleParameter getRouteHandlerParameter(Function routeHandler, string kind) {
-    exists (int index, int offset |
+    exists(int index, int offset |
       result = routeHandler.getParameter(index + offset) and
-      (if routeHandler.getNumParameter() = 4 then offset = 0 else offset = -1) |
+      (if routeHandler.getNumParameter() = 4 then offset = 0 else offset = -1)
+    |
       kind = "error" and index = 0
       or
       kind = "request" and index = 1
@@ -33,31 +33,41 @@ module ConnectExpressShared {
    * For example, this could be the function `function(req, res, next){...}`.
    */
   class RouteHandlerCandidate extends HTTP::RouteHandlerCandidate {
-
     RouteHandlerCandidate() {
-      exists (string request, string response, string next, string error |
+      exists(string request, string response, string next, string error |
         (request = "request" or request = "req") and
         (response = "response" or response = "res") and
         (next = "next") and
-        (error = "error" or error = "err") |
+        (error = "error" or error = "err")
+      |
         // heuristic: parameter names match the documentation
         astNode.getNumParameter() >= 2 and
         getRouteHandlerParameter(astNode, "request").getName() = request and
         getRouteHandlerParameter(astNode, "response").getName() = response and
-        (astNode.getNumParameter() >= 3 implies getRouteHandlerParameter(astNode, "next").getName() = next) and
-        (astNode.getNumParameter() = 4 implies getRouteHandlerParameter(astNode, "error").getName() = error) and
+        (
+          astNode.getNumParameter() >= 3
+          implies
+          getRouteHandlerParameter(astNode, "next").getName() = next
+        ) and
+        (
+          astNode.getNumParameter() = 4
+          implies
+          getRouteHandlerParameter(astNode, "error").getName() = error
+        ) and
         not (
           // heuristic: max four parameters (the server will only supply four arguments)
-          astNode.getNumParameter() > 4 or
+          astNode.getNumParameter() > 4
+          or
           // heuristic: not a class method (the server invokes this with a function call)
-          astNode = any(MethodDefinition def).getBody() or
+          astNode = any(MethodDefinition def).getBody()
+          or
           // heuristic: does not return anything (the server will not use the return value)
-          exists(astNode.getAReturnStmt().getExpr()) or
+          exists(astNode.getAReturnStmt().getExpr())
+          or
           // heuristic: is not invoked (the server invokes this at a call site we cannot reason precisely about)
           exists(DataFlow::InvokeNode cs | cs.getACallee() = astNode)
         )
       )
     }
   }
-
-}
\ No newline at end of file
+}
diff --git a/javascript/ql/src/semmle/javascript/frameworks/CookieLibraries.qll b/javascript/ql/src/semmle/javascript/frameworks/CookieLibraries.qll
index 498117b86528..11b23858ae0e 100644
--- a/javascript/ql/src/semmle/javascript/frameworks/CookieLibraries.qll
+++ b/javascript/ql/src/semmle/javascript/frameworks/CookieLibraries.qll
@@ -1,4 +1,3 @@
-
 /**
  * Provides classes for reasoning about cookies.
  */
@@ -76,11 +75,10 @@ private module LibCookie {
 
   class ReadAccess extends PersistentReadAccess {
     string key;
+
     ReadAccess() { this = libMemberCall("parse").getAPropertyRead(key) }
 
-    override PersistentWriteAccess getAWrite() {
-      key = result.(WriteAccess).getKey()
-    }
+    override PersistentWriteAccess getAWrite() { key = result.(WriteAccess).getKey() }
   }
 
   class WriteAccess extends PersistentWriteAccess, DataFlow::CallNode {
diff --git a/javascript/ql/src/semmle/javascript/frameworks/CryptoLibraries.qll b/javascript/ql/src/semmle/javascript/frameworks/CryptoLibraries.qll
index 88d6516f855f..d2aacc210000 100644
--- a/javascript/ql/src/semmle/javascript/frameworks/CryptoLibraries.qll
+++ b/javascript/ql/src/semmle/javascript/frameworks/CryptoLibraries.qll
@@ -2,7 +2,6 @@
  * Provides classes for modelling cryptographic libraries.
  */
 
-
 import javascript
 
 /**
@@ -18,9 +17,12 @@ private module AlgorithmNames {
   predicate isStrongHashingAlgorithm(string name) {
     name = "DSA" or
     name = "ED25519" or
-    name = "ES256" or name = "ECDSA256" or
-    name = "ES384" or name = "ECDSA384" or
-    name = "ES512" or name = "ECDSA512" or
+    name = "ES256" or
+    name = "ECDSA256" or
+    name = "ES384" or
+    name = "ECDSA384" or
+    name = "ES512" or
+    name = "ECDSA512" or
     name = "SHA2" or
     name = "SHA224" or
     name = "SHA256" or
@@ -53,15 +55,21 @@ private module AlgorithmNames {
     name = "RSA" or
     name = "RABBIT" or
     name = "BLOWFISH"
-
   }
 
   predicate isWeakEncryptionAlgorithm(string name) {
     name = "DES" or
-    name = "3DES" or name = "TRIPLEDES" or name = "TDEA" or name = "TRIPLEDEA" or
-    name = "ARC2" or name = "RC2" or
-    name = "ARC4" or name = "RC4" or name = "ARCFOUR" or
-    name = "ARC5" or name = "RC5"
+    name = "3DES" or
+    name = "TRIPLEDES" or
+    name = "TDEA" or
+    name = "TRIPLEDEA" or
+    name = "ARC2" or
+    name = "RC2" or
+    name = "ARC4" or
+    name = "RC4" or
+    name = "ARCFOUR" or
+    name = "ARC5" or
+    name = "RC5"
   }
 
   predicate isStrongPasswordHashingAlgorithm(string name) {
@@ -71,9 +79,7 @@ private module AlgorithmNames {
     name = "SCRYPT"
   }
 
-  predicate isWeakPasswordHashingAlgorithm(string name) {
-    none()
-  }
+  predicate isWeakPasswordHashingAlgorithm(string name) { none() }
 }
 private import AlgorithmNames
 
@@ -81,28 +87,28 @@ private import AlgorithmNames
  * A cryptographic algorithm.
  */
 private newtype TCryptographicAlgorithm =
-MkHashingAlgorithm(string name, boolean isWeak) {
-  (isStrongHashingAlgorithm(name) and isWeak = false) or
-  (isWeakHashingAlgorithm(name) and isWeak = true)
-} or
-MkEncryptionAlgorithm(string name, boolean isWeak) {
-  (isStrongEncryptionAlgorithm(name) and isWeak = false) or
-  (isWeakEncryptionAlgorithm(name) and isWeak = true)
-} or
-MkPasswordHashingAlgorithm(string name, boolean isWeak) {
-  (isStrongPasswordHashingAlgorithm(name) and isWeak = false) or
-  (isWeakPasswordHashingAlgorithm(name) and isWeak = true)
-}
+  MkHashingAlgorithm(string name, boolean isWeak) {
+    (isStrongHashingAlgorithm(name) and isWeak = false)
+    or
+    (isWeakHashingAlgorithm(name) and isWeak = true)
+  } or
+  MkEncryptionAlgorithm(string name, boolean isWeak) {
+    (isStrongEncryptionAlgorithm(name) and isWeak = false)
+    or
+    (isWeakEncryptionAlgorithm(name) and isWeak = true)
+  } or
+  MkPasswordHashingAlgorithm(string name, boolean isWeak) {
+    (isStrongPasswordHashingAlgorithm(name) and isWeak = false)
+    or
+    (isWeakPasswordHashingAlgorithm(name) and isWeak = true)
+  }
 
 /**
  * A cryptographic algorithm.
  */
 abstract class CryptographicAlgorithm extends TCryptographicAlgorithm {
-
   /** Gets a textual representation of this element. */
-  string toString() {
-    result = getName()
-  }
+  string toString() { result = getName() }
 
   /**
    * Gets the name of this algorithm.
@@ -122,82 +128,57 @@ abstract class CryptographicAlgorithm extends TCryptographicAlgorithm {
    * Holds if this algorithm is weak.
    */
   abstract predicate isWeak();
-
 }
 
 /**
  * A hashing algorithm such as `MD5` or `SHA512`.
  */
 class HashingAlgorithm extends MkHashingAlgorithm, CryptographicAlgorithm {
-
   string name;
 
   boolean isWeak;
 
-  HashingAlgorithm() {
-    this = MkHashingAlgorithm(name, isWeak)
-  }
+  HashingAlgorithm() { this = MkHashingAlgorithm(name, isWeak) }
 
-  override string getName() {
-    result = name
-  }
-
-  override predicate isWeak() {
-    isWeak = true
-  }
+  override string getName() { result = name }
 
+  override predicate isWeak() { isWeak = true }
 }
 
 /**
  * An encryption algorithm such as `DES` or `AES512`.
  */
 class EncryptionAlgorithm extends MkEncryptionAlgorithm, CryptographicAlgorithm {
-
   string name;
 
   boolean isWeak;
 
-  EncryptionAlgorithm() {
-    this = MkEncryptionAlgorithm(name, isWeak)
-  }
+  EncryptionAlgorithm() { this = MkEncryptionAlgorithm(name, isWeak) }
 
-  override string getName() {
-    result = name
-  }
-
-  override predicate isWeak() {
-    isWeak = true
-  }
+  override string getName() { result = name }
 
+  override predicate isWeak() { isWeak = true }
 }
 
 /**
  * A password hashing algorithm such as `PBKDF2` or `SCRYPT`.
  */
-class PasswordHashingAlgorithm extends MkPasswordHashingAlgorithm, CryptographicAlgorithm  {
-
+class PasswordHashingAlgorithm extends MkPasswordHashingAlgorithm, CryptographicAlgorithm {
   string name;
 
   boolean isWeak;
 
-  PasswordHashingAlgorithm() {
-    this = MkPasswordHashingAlgorithm(name, isWeak)
-  }
+  PasswordHashingAlgorithm() { this = MkPasswordHashingAlgorithm(name, isWeak) }
 
-  override string getName() {
-    result = name
-  }
+  override string getName() { result = name }
 
-  override predicate isWeak() {
-    isWeak = true
-  }
+  override predicate isWeak() { isWeak = true }
 }
 
 /**
  * An application of a cryptographic algorithm.
  */
 abstract class CryptographicOperation extends Expr {
-
   /**
    * Gets the input the algorithm is used on, e.g. the plain text input to be encrypted.
    */
@@ -207,53 +188,43 @@ abstract class CryptographicOperation extends Expr {
    * Gets the applied algorithm.
    */
   abstract CryptographicAlgorithm getAlgorithm();
-
 }
 
 /**
  * A key used in a cryptographic algorithm.
  */
-abstract class CryptographicKey extends DataFlow::ValueNode {
-
-}
+abstract class CryptographicKey extends DataFlow::ValueNode { }
 
 /**
  * A key used in a cryptographic algorithm, viewed as a `CredentialsExpr`.
  */
 class CryptographicKeyCredentialsExpr extends CredentialsExpr {
+  CryptographicKeyCredentialsExpr() { this = any(CryptographicKey k).asExpr() }
 
-  CryptographicKeyCredentialsExpr() {
-    this = any(CryptographicKey k).asExpr()
-  }
-
-  override string getCredentialsKind() {
-    result = "key"
-  }
-
+  override string getCredentialsKind() { result = "key" }
 }
 
 /**
  * A model of the asmCrypto library.
  */
 private module AsmCrypto {
-
   private class Apply extends CryptographicOperation {
-
     Expr input;
 
     CryptographicAlgorithm algorithm; // non-functional
 
     Apply() {
       /*
-      ```
-      asmCrypto.SHA256.hex(input)
-      ```
-      matched as:
-      ```
-      asmCrypto.<algorithmName>._(<input>)
-      ```
+       *      ```
+       *      asmCrypto.SHA256.hex(input)
+       *      ```
+       *      matched as:
+       *      ```
+       *      asmCrypto.<algorithmName>._(<input>)
+       *      ```
        */
-      exists (DataFlow::CallNode mce | this = mce.asExpr() |
+
+      exists(DataFlow::CallNode mce | this = mce.asExpr() |
         exists(DataFlow::SourceNode asmCrypto, string algorithmName |
           asmCrypto = DataFlow::globalVarRef("asmCrypto") and
           algorithm.matchesName(algorithmName) and
@@ -263,57 +234,45 @@ private module AsmCrypto {
       )
     }
 
-    override Expr getInput() {
-      result = input
-    }
-
-    override CryptographicAlgorithm getAlgorithm() {
-      result = algorithm
-    }
+    override Expr getInput() { result = input }
 
+    override CryptographicAlgorithm getAlgorithm() { result = algorithm }
   }
-
 }
 
 /**
  * A model of the browserid-crypto library.
  */
 private module BrowserIdCrypto {
-
-  private class Key extends CryptographicKey {
-
-    Key() {
-      this = any(Apply apply).getKey()
-    }
-
-  }
+  private class Key extends CryptographicKey { Key() { this = any(Apply apply).getKey() } }
 
   private class Apply extends CryptographicOperation {
-
     CryptographicAlgorithm algorithm; // non-functional
 
     MethodCallExpr mce;
 
     Apply() {
       /*
-      ```
-      var jwcrypto = require("browserid-crypto");
-      jwcrypto.generateKeypair({algorithm: 'DSA'}, function() {
-          jwcrypto.sign(input, key);
-        });
-      ```
-      matched as:
-      ```
-      var jwcrypto = require("browserid-crypto");
-      jwcrypto.generateKeypair({algorithm: <algorithmName>}, function() {
-          jwcrypto.sign(<input>, <key>);
-        });
-      ```
+       *      ```
+       *      var jwcrypto = require("browserid-crypto");
+       *      jwcrypto.generateKeypair({algorithm: 'DSA'}, function() {
+       *          jwcrypto.sign(input, key);
+       *        });
+       *      ```
+       *      matched as:
+       *      ```
+       *      var jwcrypto = require("browserid-crypto");
+       *      jwcrypto.generateKeypair({algorithm: <algorithmName>}, function() {
+       *          jwcrypto.sign(<input>, <key>);
+       *        });
+       *      ```
        */
+
       this = mce and
-      exists(DataFlow::SourceNode mod,
-             DataFlow::Node algorithmNameNode, DataFlow::CallNode keygen,
-             DataFlow::FunctionNode callback |
+      exists(
+        DataFlow::SourceNode mod, DataFlow::Node algorithmNameNode, DataFlow::CallNode keygen,
+        DataFlow::FunctionNode callback
+      |
         mod = DataFlow::moduleImport("browserid-crypto") and
         keygen = mod.getAMemberCall("generateKeypair") and
         algorithmNameNode = keygen.getOptionArgument(0, "algorithm") and
@@ -323,62 +282,51 @@ private module BrowserIdCrypto {
       )
     }
 
-    override Expr getInput() {
-      result = mce.getArgument(0)
-    }
+    override Expr getInput() { result = mce.getArgument(0) }
 
-    override CryptographicAlgorithm getAlgorithm() {
-      result = algorithm
-    }
+    override CryptographicAlgorithm getAlgorithm() { result = algorithm }
 
-    DataFlow::Node getKey() {
-      result.asExpr() = mce.getArgument(1)
-    }
+    DataFlow::Node getKey() { result.asExpr() = mce.getArgument(1) }
   }
-
 }
 
 /**
  * A model of the Node.js builtin crypto library.
  */
-private module NodeJSCrypto  {
-
+private module NodeJSCrypto {
   private class InstantiatedAlgorithm extends DataFlow::CallNode {
-
     CryptographicAlgorithm algorithm; // non-functional
 
     InstantiatedAlgorithm() {
       /*
-       ```
-       const crypto = require('crypto');
-       const cipher = crypto.createCipher('aes192', 'a password');
-       ```
-       matched as:
-       ```
-       const crypto = require('crypto');
-       const cipher = crypto.createCipher(<algorithmName>, 'a password');
-       ```
-       Also matches `createHash`, `createHmac`, `createSign` instead of `createCipher`.
+       *       ```
+       *       const crypto = require('crypto');
+       *       const cipher = crypto.createCipher('aes192', 'a password');
+       *       ```
+       *       matched as:
+       *       ```
+       *       const crypto = require('crypto');
+       *       const cipher = crypto.createCipher(<algorithmName>, 'a password');
+       *       ```
+       *       Also matches `createHash`, `createHmac`, `createSign` instead of `createCipher`.
        */
+
       exists(DataFlow::SourceNode mod, string createSuffix |
         createSuffix = "Hash" or
         createSuffix = "Hmac" or
         createSuffix = "Sign" or
-        createSuffix = "Cipher" |
+        createSuffix = "Cipher"
+      |
         mod = DataFlow::moduleImport("crypto") and
         this = mod.getAMemberCall("create" + createSuffix) and
         algorithm.matchesName(getArgument(0).asExpr().getStringValue())
       )
     }
 
-    CryptographicAlgorithm getAlgorithm() {
-      result = algorithm
-    }
-
+    CryptographicAlgorithm getAlgorithm() { result = algorithm }
   }
 
   private class Apply extends CryptographicOperation, MethodCallExpr {
-
     Expr input;
 
     InstantiatedAlgorithm instantiation;
@@ -387,58 +335,51 @@ private module NodeJSCrypto  {
       this = instantiation.getAMethodCall(any(string m | m = "update" or m = "write")).asExpr()
     }
 
-    override Expr getInput() {
-      result = getArgument(0)
-    }
-
-    override CryptographicAlgorithm getAlgorithm() {
-      result = instantiation.getAlgorithm()
-    }
+    override Expr getInput() { result = getArgument(0) }
 
+    override CryptographicAlgorithm getAlgorithm() { result = instantiation.getAlgorithm() }
   }
 
   private class Key extends CryptographicKey {
-
     Key() {
-      exists (InstantiatedAlgorithm instantiation, string name |
+      exists(InstantiatedAlgorithm instantiation, string name |
         name = "setPrivateKey" or
-        name = "sign" |
+        name = "sign"
+      |
         this = instantiation.getAMethodCall(name).getArgument(0)
-      ) or
+      )
+      or
       exists(DataFlow::SourceNode mod, string name, DataFlow::InvokeNode call, int index |
         mod = DataFlow::moduleImport("crypto") and
         call = mod.getAMemberCall(name) and
-        this = call.getArgument(index) |
-        index = 0 and (name = "privateDecrypt" or name = "privateEncrypt")
+        this = call.getArgument(index)
+      |
+        index = 0 and
+        (name = "privateDecrypt" or name = "privateEncrypt")
         or
-        index = 1 and (name = "createCipheriv" or name = "Decipheriv" or name = "createHmac")
+        index = 1 and
+        (name = "createCipheriv" or name = "Decipheriv" or name = "createHmac")
       )
     }
-
   }
-
-
 }
 
-
 /**
  * A model of the crypto-js library.
  */
 private module CryptoJS {
-
   /**
    *  Matches `CryptoJS.<algorithmName>` and `require("crypto-js/<algorithmName>")`
    */
   private DataFlow::SourceNode getAlgorithmExpr(CryptographicAlgorithm algorithm) {
-    exists(string algorithmName |
-      algorithm.matchesName(algorithmName) |
-      exists(DataFlow::SourceNode mod |
-        mod = DataFlow::moduleImport("crypto-js") |
+    exists(string algorithmName | algorithm.matchesName(algorithmName) |
+      exists(DataFlow::SourceNode mod | mod = DataFlow::moduleImport("crypto-js") |
         result = mod.getAPropertyRead(algorithmName) or
         result = mod.getAPropertyRead("Hmac" + algorithmName) // they prefix Hmac
-      ) or
+      )
+      or
       exists(DataFlow::SourceNode mod |
-        mod = DataFlow::moduleImport("crypto-js/" + algorithmName)  and
+        mod = DataFlow::moduleImport("crypto-js/" + algorithmName) and
         result = mod
       )
     )
@@ -446,41 +387,42 @@ private module CryptoJS {
 
   private DataFlow::CallNode getEncryptionApplication(Expr input, CryptographicAlgorithm algorithm) {
     /*
-    ```
-    var CryptoJS = require("crypto-js");
-    CryptoJS.AES.encrypt('my message', 'secret key 123');
-    ```
-    Matched as:
-    ```
-    var CryptoJS = require("crypto-js");
-    CryptoJS.<algorithmName>.encrypt(<input>, 'secret key 123');
-    ```
-    Also matches where `CryptoJS.<algorithmName>` has been replaced by `require("crypto-js/<algorithmName>")`
+     *    ```
+     *    var CryptoJS = require("crypto-js");
+     *    CryptoJS.AES.encrypt('my message', 'secret key 123');
+     *    ```
+     *    Matched as:
+     *    ```
+     *    var CryptoJS = require("crypto-js");
+     *    CryptoJS.<algorithmName>.encrypt(<input>, 'secret key 123');
+     *    ```
+     *    Also matches where `CryptoJS.<algorithmName>` has been replaced by `require("crypto-js/<algorithmName>")`
      */
+
     result = getAlgorithmExpr(algorithm).getAMemberCall("encrypt") and
     input = result.getArgument(0).asExpr()
   }
 
   private DataFlow::CallNode getDirectApplication(Expr input, CryptographicAlgorithm algorithm) {
     /*
-    ```
-    var CryptoJS = require("crypto-js");
-    CryptoJS.SHA1("Message", "Key");
-    ```
-    Matched as:
-    ```
-    var CryptoJS = require("crypto-js");
-    CryptoJS.<algorithmName>(<input>, "Key");
-    ```
-    An `Hmac`-prefix of <algorithmName> is ignored.
-    Also matches where `CryptoJS.<algorithmName>` has been replaced by `require("crypto-js/<algorithmName>")`
+     *    ```
+     *    var CryptoJS = require("crypto-js");
+     *    CryptoJS.SHA1("Message", "Key");
+     *    ```
+     *    Matched as:
+     *    ```
+     *    var CryptoJS = require("crypto-js");
+     *    CryptoJS.<algorithmName>(<input>, "Key");
+     *    ```
+     *    An `Hmac`-prefix of <algorithmName> is ignored.
+     *    Also matches where `CryptoJS.<algorithmName>` has been replaced by `require("crypto-js/<algorithmName>")`
      */
+
     result = getAlgorithmExpr(algorithm).getACall() and
     input = result.getArgument(0).asExpr()
   }
 
-   private class Apply extends CryptographicOperation {
-
+  private class Apply extends CryptographicOperation {
     Expr input;
 
     CryptographicAlgorithm algorithm; // non-functional
@@ -490,24 +432,20 @@ private module CryptoJS {
       this = getDirectApplication(input, algorithm).asExpr()
     }
 
-    override Expr getInput() {
-      result = input
-    }
-
-    override CryptographicAlgorithm getAlgorithm() {
-      result = algorithm
-    }
+    override Expr getInput() { result = input }
 
+    override CryptographicAlgorithm getAlgorithm() { result = algorithm }
   }
 
   private class Key extends CryptographicKey {
-
     Key() {
       exists(DataFlow::SourceNode e, CryptographicAlgorithm algorithm |
-        e = getAlgorithmExpr(algorithm) |
-        exists (string name |
+        e = getAlgorithmExpr(algorithm)
+      |
+        exists(string name |
           name = "encrypt" or
-          name = "decrypt" |
+          name = "decrypt"
+        |
           algorithm instanceof EncryptionAlgorithm and
           this = e.getAMemberCall(name).getArgument(1)
         )
@@ -516,7 +454,6 @@ private module CryptoJS {
         this = e.getACall().getArgument(1)
       )
     }
-
   }
 }
 
@@ -524,9 +461,7 @@ private module CryptoJS {
  * A model of the TweetNaCl library.
  */
 private module TweetNaCl {
-
   private class Apply extends CryptographicOperation {
-
     Expr input;
 
     CryptographicAlgorithm algorithm;
@@ -535,45 +470,38 @@ private module TweetNaCl {
 
     Apply() {
       /*
-      ```
-      require("nacl").sign('my message');
-      ```
-      Matched as:
-      ```
-      require("nacl").sign(<input>);
-      ```
-      Also matches the "hash" method name, and the "nacl-fast" module.
-      */
+       *      ```
+       *      require("nacl").sign('my message');
+       *      ```
+       *      Matched as:
+       *      ```
+       *      require("nacl").sign(<input>);
+       *      ```
+       *      Also matches the "hash" method name, and the "nacl-fast" module.
+       */
+
       this = mce and
       exists(DataFlow::SourceNode mod, string name |
         name = "hash" and algorithm.matchesName("SHA512")
         or
-        name = "sign" and algorithm.matchesName("ed25519") |
+        name = "sign" and algorithm.matchesName("ed25519")
+      |
         (mod = DataFlow::moduleImport("nacl") or mod = DataFlow::moduleImport("nacl-fast")) and
         mce = mod.getAMemberCall(name).asExpr() and
         mce.getArgument(0) = input
       )
     }
 
-    override Expr getInput() {
-      result = input
-    }
-
-    override CryptographicAlgorithm getAlgorithm() {
-      result = algorithm
-
-    }
+    override Expr getInput() { result = input }
 
+    override CryptographicAlgorithm getAlgorithm() { result = algorithm }
   }
-
 }
 
-
 /**
  * A model of the hash.js library.
  */
 private module HashJs {
-
   /**
    *  Matches:
    * - `require("hash.js").<algorithmName>`()
@@ -585,17 +513,19 @@ private module HashJs {
       result = DataFlow::moduleMember("hash.js", algorithmName).getACall()
       or
       exists(DataFlow::SourceNode mod |
-        mod = DataFlow::moduleImport("hash.js/lib/hash/" + algorithmName) or
+        mod = DataFlow::moduleImport("hash.js/lib/hash/" + algorithmName)
+        or
         exists(string size |
           mod = DataFlow::moduleImport("hash.js/lib/hash/sha/" + size) and
-          algorithmName = "SHA" + size) |
+          algorithmName = "SHA" + size
+        )
+      |
         result = mod.getACall()
       )
     )
   }
 
-   private class Apply extends CryptographicOperation {
-
+  private class Apply extends CryptographicOperation {
     Expr input;
 
     CryptographicAlgorithm algorithm; // non-functional
@@ -604,61 +534,52 @@ private module HashJs {
 
     Apply() {
       /*
-      ```
-      var hash = require("hash.js");
-      hash.sha512().update('my message', 'secret key 123');
-      ```
-      Matched as:
-      ```
-      var hash = require("hash.js");
-      hash.<algorithmName>().update('my message', 'secret key 123');
-      ```
-      Also matches where `hash.<algorithmName>()` has been replaced by a more specific require a la `require("hash.js/lib/hash/sha/512")`
+       *      ```
+       *      var hash = require("hash.js");
+       *      hash.sha512().update('my message', 'secret key 123');
+       *      ```
+       *      Matched as:
+       *      ```
+       *      var hash = require("hash.js");
+       *      hash.<algorithmName>().update('my message', 'secret key 123');
+       *      ```
+       *      Also matches where `hash.<algorithmName>()` has been replaced by a more specific require a la `require("hash.js/lib/hash/sha/512")`
        */
+
       this = mce and
       mce = getAlgorithmExpr(algorithm).getAMemberCall("update").asExpr() and
       input = mce.getArgument(0)
     }
 
-    override Expr getInput() {
-      result = input
-    }
-
-    override CryptographicAlgorithm getAlgorithm() {
-      result = algorithm
-    }
+    override Expr getInput() { result = input }
 
+    override CryptographicAlgorithm getAlgorithm() { result = algorithm }
   }
-
 }
 
-
 /**
  * A model of the forge library.
  */
-private module Forge  {
-
+private module Forge {
   private DataFlow::SourceNode getAnImportNode() {
     result = DataFlow::moduleImport("forge") or
     result = DataFlow::moduleImport("node-forge")
   }
 
-  private abstract class Cipher extends DataFlow::CallNode {
-
+  abstract private class Cipher extends DataFlow::CallNode {
     abstract CryptographicAlgorithm getAlgorithm();
-
   }
 
   private class KeyCipher extends Cipher {
-
     DataFlow::Node key;
 
     CryptographicAlgorithm algorithm; // non-functional
 
     KeyCipher() {
-      exists (DataFlow::SourceNode mod, string algorithmName |
+      exists(DataFlow::SourceNode mod, string algorithmName |
         mod = getAnImportNode() and
-        algorithm.matchesName(algorithmName) |
+        algorithm.matchesName(algorithmName)
+      |
         exists(string createName, string cipherName, string cipherPrefix, string cipherSuffix |
           // `require('forge').cipher.createCipher("3DES-CBC").update("secret", "key");`
           (createName = "createCipher" or createName = "createDecipher") and
@@ -678,44 +599,37 @@ private module Forge  {
         )
         or
         // `require("forge").rc2.createEncryptionCipher("key").update("secret");`
-        exists (string createName |
-          createName = "createEncryptionCipher" or createName = "createDecryptionCipher" |
+        exists(string createName |
+          createName = "createEncryptionCipher" or createName = "createDecryptionCipher"
+        |
           this = mod.getAPropertyRead(algorithmName).getAMemberCall(createName) and
           key = getArgument(0)
         )
       )
     }
 
-    override CryptographicAlgorithm getAlgorithm() {
-      result = algorithm
-    }
-
-    DataFlow::Node getKey() {
-      result = key
-    }
+    override CryptographicAlgorithm getAlgorithm() { result = algorithm }
 
+    DataFlow::Node getKey() { result = key }
   }
 
   private class NonKeyCipher extends Cipher {
-
     CryptographicAlgorithm algorithm; // non-functional
 
     NonKeyCipher() {
-      exists (string algorithmName |
-        algorithm.matchesName(algorithmName) |
+      exists(string algorithmName | algorithm.matchesName(algorithmName) |
         // require("forge").md.md5.create().update('The quick brown fox jumps over the lazy dog');
-        this = getAnImportNode().getAPropertyRead("md").getAPropertyRead(algorithmName).getAMemberCall("create")
+        this = getAnImportNode()
+              .getAPropertyRead("md")
+              .getAPropertyRead(algorithmName)
+              .getAMemberCall("create")
       )
     }
 
-    override CryptographicAlgorithm getAlgorithm() {
-      result = algorithm
-    }
-
+    override CryptographicAlgorithm getAlgorithm() { result = algorithm }
   }
 
   private class Apply extends CryptographicOperation {
-
     Expr input;
 
     CryptographicAlgorithm algorithm; // non-functional
@@ -731,33 +645,19 @@ private module Forge  {
       )
     }
 
-    override Expr getInput() {
-      result = input
-    }
-
-    override CryptographicAlgorithm getAlgorithm() {
-      result = algorithm
-    }
-
-  }
-
-  private class Key extends CryptographicKey {
-
-    Key() {
-      this = any(KeyCipher cipher).getKey()
-    }
+    override Expr getInput() { result = input }
 
+    override CryptographicAlgorithm getAlgorithm() { result = algorithm }
   }
 
+  private class Key extends CryptographicKey { Key() { this = any(KeyCipher cipher).getKey() } }
 }
 
 /**
  * A model of the md5 library.
  */
-private module Md5  {
-
+private module Md5 {
   private class Apply extends CryptographicOperation {
-
     Expr input;
 
     CryptographicAlgorithm algorithm;
@@ -775,25 +675,17 @@ private module Md5  {
       )
     }
 
-    override Expr getInput() {
-      result = input
-    }
-
-    override CryptographicAlgorithm getAlgorithm() {
-      result = algorithm
-    }
+    override Expr getInput() { result = input }
 
+    override CryptographicAlgorithm getAlgorithm() { result = algorithm }
   }
-
 }
 
 /**
  * A model of the bcrypt, bcryptjs, bcrypt-nodejs libraries.
  */
-private module Bcrypt  {
-
+private module Bcrypt {
   private class Apply extends CryptographicOperation {
-
     Expr input;
 
     CryptographicAlgorithm algorithm;
@@ -809,7 +701,8 @@ private module Bcrypt  {
           moduleName = "bcrypt" or
           moduleName = "bcryptjs" or
           moduleName = "bcrypt-nodejs"
-        ) and (
+        ) and
+        (
           methodName = "hash" or
           methodName = "hashSync"
         ) and
@@ -819,25 +712,17 @@ private module Bcrypt  {
       )
     }
 
-    override Expr getInput() {
-      result = input
-    }
-
-    override CryptographicAlgorithm getAlgorithm() {
-      result = algorithm
-    }
+    override Expr getInput() { result = input }
 
+    override CryptographicAlgorithm getAlgorithm() { result = algorithm }
   }
-
 }
 
 /**
  * A model of the hasha library.
  */
-private module Hasha  {
-
+private module Hasha {
   private class Apply extends CryptographicOperation {
-
     Expr input;
 
     CryptographicAlgorithm algorithm;
@@ -857,30 +742,17 @@ private module Hasha  {
       )
     }
 
-    override Expr getInput() {
-      result = input
-    }
-
-    override CryptographicAlgorithm getAlgorithm() {
-      result = algorithm
-    }
+    override Expr getInput() { result = input }
 
+    override CryptographicAlgorithm getAlgorithm() { result = algorithm }
   }
 
-
   /**
    * Provides classes for working with the `express-jwt` package (https://github.com/auth0/express-jwt);
    */
   module ExpressJwt {
-
     private class Key extends CryptographicKey {
-
-      Key() {
-        this = DataFlow::moduleMember("express-jwt", "sign").getACall().getArgument(1)
-      }
-
+      Key() { this = DataFlow::moduleMember("express-jwt", "sign").getACall().getArgument(1) }
     }
-
   }
-
 }
diff --git a/javascript/ql/src/semmle/javascript/frameworks/DigitalOcean.qll b/javascript/ql/src/semmle/javascript/frameworks/DigitalOcean.qll
index c56af07f2179..76077c930236 100644
--- a/javascript/ql/src/semmle/javascript/frameworks/DigitalOcean.qll
+++ b/javascript/ql/src/semmle/javascript/frameworks/DigitalOcean.qll
@@ -1,27 +1,24 @@
 /**
  * Provides classes for working with [DigitalOcean](https://www.npmjs.com/package/digitalocean) applications.
  */
+
 import javascript
 
 module DigitalOcean {
-
   /**
    * An expression that is used for authentication at DigitalOcean: `digitalocean.client(<token>)`.
    */
   class Credentials extends CredentialsExpr {
-
     string kind;
 
     Credentials() {
-      exists (CallExpr mce |
-        mce = DataFlow::moduleMember("digitalocean", "client").getACall().asExpr() |
+      exists(CallExpr mce |
+        mce = DataFlow::moduleMember("digitalocean", "client").getACall().asExpr()
+      |
         this = mce.getArgument(0) and kind = "token"
       )
     }
 
-    override string getCredentialsKind() {
-      result = kind
-    }
-
+    override string getCredentialsKind() { result = kind }
   }
-}
\ No newline at end of file
+}
diff --git a/javascript/ql/src/semmle/javascript/frameworks/Electron.qll b/javascript/ql/src/semmle/javascript/frameworks/Electron.qll
index fe8010d8fc89..bd2a2ba2f8a4 100644
--- a/javascript/ql/src/semmle/javascript/frameworks/Electron.qll
+++ b/javascript/ql/src/semmle/javascript/frameworks/Electron.qll
@@ -9,13 +9,12 @@ module Electron {
       exists(BrowserObject bo | this = bo.getOptionArgument(0, "webPreferences").getALocalSource())
     }
   }
-  
+
   /**
    * A data flow node that creates a new `BrowserWindow` or `BrowserView`.
    */
-  private abstract class BrowserObject extends DataFlow::NewNode {
-  }
-  
+  abstract private class BrowserObject extends DataFlow::NewNode { }
+
   /**
    * A data flow node that creates a new `BrowserWindow`.
    */
@@ -24,30 +23,24 @@ module Electron {
       this = DataFlow::moduleMember("electron", "BrowserWindow").getAnInstantiation()
     }
   }
-  
+
   /**
    * A data flow node that creates a new `BrowserView`.
    */
   class BrowserView extends BrowserObject {
-    BrowserView() {
-      this = DataFlow::moduleMember("electron", "BrowserView").getAnInstantiation()
-    }
+    BrowserView() { this = DataFlow::moduleMember("electron", "BrowserView").getAnInstantiation() }
   }
 
   /**
    * A Node.js-style HTTP or HTTPS request made using an Electron module.
    */
-  abstract class CustomElectronClientRequest extends NodeJSLib::CustomNodeJSClientRequest {}
+  abstract class CustomElectronClientRequest extends NodeJSLib::CustomNodeJSClientRequest { }
 
   /**
    * A Node.js-style HTTP or HTTPS request made using an Electron module.
    */
   class ElectronClientRequest extends NodeJSLib::NodeJSClientRequest {
-
-    ElectronClientRequest() {
-      this instanceof CustomElectronClientRequest
-    }
-
+    ElectronClientRequest() { this instanceof CustomElectronClientRequest }
   }
 
   /**
@@ -65,23 +58,21 @@ module Electron {
     }
 
     override DataFlow::Node getHost() {
-      exists (string name |
+      exists(string name |
         name = "host" or
-        name = "hostname" |
+        name = "hostname"
+      |
         result = getOptionArgument(0, name)
       )
     }
 
     override DataFlow::Node getADataNode() {
-      exists (string name |
-        name = "write" or name = "end" |
-        result =this.(DataFlow::SourceNode).getAMethodCall(name).getArgument(0)
+      exists(string name | name = "write" or name = "end" |
+        result = this.(DataFlow::SourceNode).getAMethodCall(name).getArgument(0)
       )
     }
-
   }
-  
-    
+
   /**
    * A data flow node that is the parameter of a redirect callback for an HTTP or HTTPS request made by a Node.js process, for example `res` in `net.request(url).on('redirect', (res) => {})`.
    */
@@ -93,9 +84,7 @@ module Electron {
         handler.getClientRequest() instanceof ElectronClientRequest
       )
     }
-    
-    override string getSourceType() {
-      result = "ElectronClientRequest redirect event"
-    }
+
+    override string getSourceType() { result = "ElectronClientRequest redirect event" }
   }
-}
\ No newline at end of file
+}
diff --git a/javascript/ql/src/semmle/javascript/frameworks/Emscripten.qll b/javascript/ql/src/semmle/javascript/frameworks/Emscripten.qll
index 21f1e18cab7a..0e5575226f77 100644
--- a/javascript/ql/src/semmle/javascript/frameworks/Emscripten.qll
+++ b/javascript/ql/src/semmle/javascript/frameworks/Emscripten.qll
@@ -8,43 +8,34 @@ import semmle.javascript.GeneratedCode
 /**
  * An Emscripten marker comment.
  */
-abstract class EmscriptenMarkerComment extends GeneratedCodeMarkerComment {
-}
+abstract class EmscriptenMarkerComment extends GeneratedCodeMarkerComment { }
 
 /**
  * An `EMSCRIPTEN_START_ASM` marker comment.
  */
 class EmscriptenStartASMComment extends EmscriptenMarkerComment {
-  EmscriptenStartASMComment() {
-    getText().trim() = "EMSCRIPTEN_START_ASM"
-  }
+  EmscriptenStartASMComment() { getText().trim() = "EMSCRIPTEN_START_ASM" }
 }
 
 /**
  * An `EMSCRIPTEN_START_FUNCS` marker comment.
  */
 class EmscriptenStartFuncsComment extends EmscriptenMarkerComment {
-  EmscriptenStartFuncsComment() {
-    getText().trim() = "EMSCRIPTEN_START_FUNCS"
-  }
+  EmscriptenStartFuncsComment() { getText().trim() = "EMSCRIPTEN_START_FUNCS" }
 }
 
 /**
  * An `EMSCRIPTEN_END_ASM` marker comment.
  */
 class EmscriptenEndASMComment extends EmscriptenMarkerComment {
-  EmscriptenEndASMComment() {
-    getText().trim() = "EMSCRIPTEN_END_ASM"
-  }
+  EmscriptenEndASMComment() { getText().trim() = "EMSCRIPTEN_END_ASM" }
 }
 
 /**
  * An `EMSCRIPTEN_END_FUNCS` marker comment.
  */
 class EmscriptenEndFuncsComment extends EmscriptenMarkerComment {
-  EmscriptenEndFuncsComment() {
-    getText().trim() = "EMSCRIPTEN_END_FUNCS"
-  }
+  EmscriptenEndFuncsComment() { getText().trim() = "EMSCRIPTEN_END_FUNCS" }
 }
 
 /**
@@ -52,7 +43,5 @@ class EmscriptenEndFuncsComment extends EmscriptenMarkerComment {
  * by an Emscripten marker comment.
  */
 class EmscriptenGeneratedToplevel extends TopLevel {
-  EmscriptenGeneratedToplevel() {
-    exists (EmscriptenMarkerComment emc | this = emc.getTopLevel())
-  }
-}
\ No newline at end of file
+  EmscriptenGeneratedToplevel() { exists(EmscriptenMarkerComment emc | this = emc.getTopLevel()) }
+}
diff --git a/javascript/ql/src/semmle/javascript/frameworks/Express.qll b/javascript/ql/src/semmle/javascript/frameworks/Express.qll
index 994f4c0c9acf..3004c3ae1fc4 100644
--- a/javascript/ql/src/semmle/javascript/frameworks/Express.qll
+++ b/javascript/ql/src/semmle/javascript/frameworks/Express.qll
@@ -14,7 +14,7 @@ module Express {
    * Express application.
    */
   DataFlow::SourceNode appCreation() {
-    exists (DataFlow::ModuleImportNode express | express.getPath() = "express" |
+    exists(DataFlow::ModuleImportNode express | express.getPath() = "express" |
       // `app = [new] express()`
       result = express.getAnInvocation()
     )
@@ -39,25 +39,19 @@ module Express {
    *
    * Holds if `e` is an expression that creates a new Express application.
    */
-  deprecated predicate isAppCreation(InvokeExpr e) {
-    e = appCreation().asExpr()
-  }
+  deprecated predicate isAppCreation(InvokeExpr e) { e = appCreation().asExpr() }
 
   /**
    * DEPRECATED: Use `appCreation()` instead.
    *
    * Holds if `e` is an Express application object
    */
-  deprecated predicate isApp(Expr e) {
-    any(Application app).flowsTo(e)
-  }
+  deprecated predicate isApp(Expr e) { any(Application app).flowsTo(e) }
 
   /**
    * Holds if `e` creates an Express router (possibly an application).
    */
-  deprecated predicate isRouterCreation(InvokeExpr e) {
-    e = routerCreation().asExpr()
-  }
+  deprecated predicate isRouterCreation(InvokeExpr e) { e = routerCreation().asExpr() }
 
   /**
    * Holds if `e` may refer to the given `router` object.
@@ -82,41 +76,34 @@ module Express {
     }
 
     /** Gets the router from which this route was created. */
-    RouterDefinition getRouter() {
-      result = router
-    }
+    RouterDefinition getRouter() { result = router }
   }
 
   /**
    * A call to an Express method that sets up a route.
    */
   class RouteSetup extends HTTP::Servers::StandardRouteSetup, MethodCallExpr {
-
     RouterDefinition router;
 
     RouteSetup() {
-      exists (string methodName | methodName = getMethodName() |
-        (isRouter(getReceiver(), router) or getReceiver().(RouteExpr).getRouter() = router)
-        and
-        (methodName = "all" or methodName = "use" or
-         methodName = any(HTTP::RequestMethodName m).toLowerCase())
+      exists(string methodName | methodName = getMethodName() |
+        (isRouter(getReceiver(), router) or getReceiver().(RouteExpr).getRouter() = router) and
+        (
+          methodName = "all" or
+          methodName = "use" or
+          methodName = any(HTTP::RequestMethodName m).toLowerCase()
+        )
       )
     }
 
     /** Gets the path associated with the route. */
-    string getPath() {
-      getArgument(0).mayHaveStringValue(result)
-    }
+    string getPath() { getArgument(0).mayHaveStringValue(result) }
 
     /** Gets the router on which handlers are being registered. */
-    RouterDefinition getRouter() {
-      result = router
-    }
+    RouterDefinition getRouter() { result = router }
 
     /** Holds if this is a call `use`, such as `app.use(handler)`. */
-    predicate isUseCall() {
-      getMethodName() = "use"
-    }
+    predicate isUseCall() { getMethodName() = "use" }
 
     /**
      * Gets the `n`th handler registered by this setup, with 0 being the first.
@@ -127,48 +114,39 @@ module Express {
     Expr getRouteHandlerExpr(int index) {
       // The first argument is a URI pattern if it is a string. If it could possibly be
       // a function, we consider it to be a route handler, otherwise a URI pattern.
-      exists (AnalyzedNode firstArg | firstArg = getArgument(0).analyze() |
-        if firstArg.getAType() = TTFunction() then
-          result = getArgument(index)
-        else
-          (index >= 0 and result = getArgument(index + 1))
+      exists(AnalyzedNode firstArg | firstArg = getArgument(0).analyze() |
+        if firstArg.getAType() = TTFunction()
+        then result = getArgument(index)
+        else (
+          index >= 0 and result = getArgument(index + 1)
+        )
       )
     }
 
     /** Gets an argument that represents a route handler being registered. */
-    Expr getARouteHandlerExpr() {
-      result = getRouteHandlerExpr(_)
-    }
+    Expr getARouteHandlerExpr() { result = getRouteHandlerExpr(_) }
 
     /** Gets the last argument representing a route handler being registered. */
-    Expr getLastRouteHandlerExpr() {
-      result = max(int i || getRouteHandlerExpr(i) order by i)
-    }
+    Expr getLastRouteHandlerExpr() { result = max(int i | | getRouteHandlerExpr(i) order by i) }
 
     override DataFlow::SourceNode getARouteHandler() {
       result.(DataFlow::SourceNode).flowsTo(getARouteHandlerExpr().flow()) or
       result.(DataFlow::TrackedNode).flowsTo(getARouteHandlerExpr().flow())
     }
 
-    override Expr getServer() {
-      result.(Application).getARouteHandler() = getARouteHandler()
-    }
+    override Expr getServer() { result.(Application).getARouteHandler() = getARouteHandler() }
 
     /**
      * Gets the HTTP request type this is registered for, if any.
      *
      * Has no result for `use` and `all` calls.
      */
-    HTTP::RequestMethodName getRequestMethod() {
-      result.toLowerCase() = getMethodName()
-    }
+    HTTP::RequestMethodName getRequestMethod() { result.toLowerCase() = getMethodName() }
 
     /**
      * Holds if this registers a route for all request methods.
      */
-    predicate handlesAllRequestMethods() {
-      getMethodName() = "use" or getMethodName() = "all"
-    }
+    predicate handlesAllRequestMethods() { getMethodName() = "use" or getMethodName() = "all" }
 
     /**
      * Holds if this route setup sets up a route for the same
@@ -193,25 +171,20 @@ module Express {
    */
   class RouteHandlerExpr extends Expr {
     RouteSetup setup;
+
     int index;
 
-    RouteHandlerExpr() {
-      this = setup.getRouteHandlerExpr(index)
-    }
+    RouteHandlerExpr() { this = setup.getRouteHandlerExpr(index) }
 
     /**
      * Gets the setup call that registers this route handler.
      */
-    RouteSetup getSetup() {
-      result = setup
-    }
+    RouteSetup getSetup() { result = setup }
 
     /**
      * Gets the function body of this handler, if it is defined locally.
      */
-    RouteHandler getBody() {
-      result.(DataFlow::SourceNode).flowsToExpr(this)
-    }
+    RouteHandler getBody() { result.(DataFlow::SourceNode).flowsToExpr(this) }
 
     /**
      * Holds if this is not followed by more handlers.
@@ -251,17 +224,16 @@ module Express {
       // Outside the router's original container, use the flow-insensitive model of its middleware stack.
       // Its state is not tracked to CFG nodes outside its original container.
       index = 0 and
-      exists (RouterDefinition router | router = setup.getRouter() |
+      exists(RouterDefinition router | router = setup.getRouter() |
         router.getContainer() != setup.getContainer() and
-        result = router.getMiddlewareStack())
+        result = router.getMiddlewareStack()
+      )
     }
 
     /**
      * Gets a route handler that may follow immediately after this one in its route stack.
      */
-    Express::RouteHandlerExpr getNextMiddleware() {
-      result.getPreviousMiddleware() = this
-    }
+    Express::RouteHandlerExpr getNextMiddleware() { result.getPreviousMiddleware() = this }
 
     /**
      * Gets a route handler that precedes this one (not necessarily immediately), may handle
@@ -276,15 +248,14 @@ module Express {
      */
     Express::RouteHandlerExpr getAMatchingAncestor() {
       result = getPreviousMiddleware+() and
-      exists (RouteSetup resSetup | resSetup = result.getSetup() |
+      exists(RouteSetup resSetup | resSetup = result.getSetup() |
         // check whether request methods are compatible
-        resSetup.handlesSameRequestMethodAs(setup)
-        and
+        resSetup.handlesSameRequestMethodAs(setup) and
         // check whether `resSetup` matches on (a prefix of) the same path as `setup`
         (
           // if `result` doesn't specify a path or we cannot determine it, assume
           // that it matches
-          not exists (resSetup.getPath())
+          not exists(resSetup.getPath())
           or
           setup.getPath() = resSetup.getPath() + any(string s)
         )
@@ -292,7 +263,7 @@ module Express {
       or
       // if this is a sub-router, any previously installed middleware for the same
       // request method will necessarily match
-      exists (RouteHandlerExpr outer |
+      exists(RouteHandlerExpr outer |
         setup.getRouter() = outer.getAsSubRouter() and
         outer.getSetup().handlesSameRequestMethodAs(setup) and
         result = outer.getAMatchingAncestor()
@@ -302,9 +273,7 @@ module Express {
     /**
      * Gets the router being registered as a sub-router here, if any.
      */
-    RouterDefinition getAsSubRouter() {
-      isRouter(this, result)
-    }
+    RouterDefinition getAsSubRouter() { isRouter(this, result) }
   }
 
   /**
@@ -325,35 +294,27 @@ module Express {
     /**
      * Gets the parameter of the route handler that contains the request object.
      */
-    SimpleParameter getRequestParameter() {
-      result = getRouteHandlerParameter("request")
-    }
+    SimpleParameter getRequestParameter() { result = getRouteHandlerParameter("request") }
 
     /**
      * Gets the parameter of the route handler that contains the response object.
      */
-    SimpleParameter getResponseParameter() {
-      result = getRouteHandlerParameter("response")
-    }
+    SimpleParameter getResponseParameter() { result = getRouteHandlerParameter("response") }
 
     /**
      * Gets a request body access of this handler.
      */
-    Expr getARequestBodyAccess() {
-      result.(PropAccess).accesses(getARequestExpr(), "body")
-    }
+    Expr getARequestBodyAccess() { result.(PropAccess).accesses(getARequestExpr(), "body") }
   }
 
   /**
    * An Express route handler installed by a route setup.
    */
   class StandardRouteHandler extends RouteHandler, HTTP::Servers::StandardRouteHandler,
-                                     DataFlow::ValueNode {
+    DataFlow::ValueNode {
     override Function astNode;
 
-    StandardRouteHandler() {
-      this = any(RouteSetup setup).getARouteHandler()
-    }
+    StandardRouteHandler() { this = any(RouteSetup setup).getARouteHandler() }
 
     override SimpleParameter getRouteHandlerParameter(string kind) {
       result = getRouteHandlerParameter(astNode, kind)
@@ -364,8 +325,7 @@ module Express {
    * Holds if `call` is a chainable method call on the response object of `handler`.
    */
   private predicate isChainableResponseMethodCall(RouteHandler handler, MethodCallExpr call) {
-    exists (string name |
-      call.calls(handler.getAResponseExpr(), name) |
+    exists(string name | call.calls(handler.getAResponseExpr(), name) |
       name = "append" or
       name = "attachment" or
       name = "clearCookie" or
@@ -402,9 +362,7 @@ module Express {
     /**
      * Gets the route handler that provides this response.
      */
-    override RouteHandler getRouteHandler() {
-      result = rh
-    }
+    override RouteHandler getRouteHandler() { result = rh }
   }
 
   /**
@@ -414,49 +372,43 @@ module Express {
   private class RequestSource extends HTTP::Servers::RequestSource {
     RouteHandler rh;
 
-    RequestSource() {
-      this = DataFlow::parameterNode(rh.getRequestParameter())
-    }
+    RequestSource() { this = DataFlow::parameterNode(rh.getRequestParameter()) }
 
     /**
      * Gets the route handler that handles this request.
      */
-    override RouteHandler getRouteHandler() {
-      result = rh
-    }
+    override RouteHandler getRouteHandler() { result = rh }
   }
 
   /**
    * An Express response expression.
    */
-  class ResponseExpr extends HTTP::Servers::StandardResponseExpr {
-    override ResponseSource src;
-  }
+  class ResponseExpr extends HTTP::Servers::StandardResponseExpr { override ResponseSource src; }
 
   /**
    * An Express request expression.
    */
-  class RequestExpr extends HTTP::Servers::StandardRequestExpr {
-    override RequestSource src;
-  }
+  class RequestExpr extends HTTP::Servers::StandardRequestExpr { override RequestSource src; }
 
   /**
    * An access to a user-controlled Express request input.
    */
   class RequestInputAccess extends HTTP::RequestInputAccess {
     RouteHandler rh;
+
     string kind;
 
     RequestInputAccess() {
-      exists (DataFlow::Node request | request = DataFlow::valueNode(rh.getARequestExpr()) |
+      exists(DataFlow::Node request | request = DataFlow::valueNode(rh.getARequestExpr()) |
         kind = "parameter" and
         (
           this.(DataFlow::MethodCallNode).calls(request, "param")
           or
-          exists (DataFlow::PropRead base, string propName |
+          exists(DataFlow::PropRead base, string propName |
             // `req.params.name` or `req.query.name`
             base.accesses(request, propName) and
-            this = base.getAPropertyReference(_) |
+            this = base.getAPropertyReference(_)
+          |
             propName = "params" or
             propName = "query"
           )
@@ -465,10 +417,11 @@ module Express {
         kind = "body" and
         this.asExpr() = rh.getARequestBodyAccess()
         or
-        exists (string propName |
+        exists(string propName |
           // `req.url` or `req.originalUrl`
           kind = "url" and
-          this.(DataFlow::PropRef).accesses(request, propName) |
+          this.(DataFlow::PropRef).accesses(request, propName)
+        |
           propName = "url" or
           propName = "originalUrl"
         )
@@ -478,22 +431,19 @@ module Express {
         this.(DataFlow::PropRef).accesses(request, "cookies")
       )
       or
-      exists (RequestHeaderAccess access | this = access |
+      exists(RequestHeaderAccess access | this = access |
         rh = access.getRouteHandler() and
-        kind = "header")
+        kind = "header"
+      )
     }
 
-    override RouteHandler getRouteHandler() {
-      result = rh
-    }
+    override RouteHandler getRouteHandler() { result = rh }
 
-    override string getKind() {
-      result = kind
-    }
+    override string getKind() { result = kind }
 
     override predicate isUserControlledObject() {
       kind = "body" and
-      exists (ExpressLibraries::BodyParser bodyParser, RouteHandlerExpr expr |
+      exists(ExpressLibraries::BodyParser bodyParser, RouteHandlerExpr expr |
         expr.getBody() = rh and
         bodyParser.producesUserControlledObjects() and
         bodyParser.flowsToExpr(expr.getAMatchingAncestor())
@@ -505,10 +455,10 @@ module Express {
       forall(ExpressLibraries::BodyParser bodyParser | bodyParser.producesUserControlledObjects())
       or
       kind = "parameter" and
-      exists (DataFlow::Node request | request = DataFlow::valueNode(rh.getARequestExpr()) |
+      exists(DataFlow::Node request | request = DataFlow::valueNode(rh.getARequestExpr()) |
         this.(DataFlow::MethodCallNode).calls(request, "param")
         or
-        exists (DataFlow::PropRead base |
+        exists(DataFlow::PropRead base |
           // `req.query.name`
           base.accesses(request, "query") and
           this = base.getAPropertyReference(_)
@@ -524,94 +474,76 @@ module Express {
     RouteHandler rh;
 
     RequestHeaderAccess() {
-      exists (DataFlow::Node request | request = DataFlow::valueNode(rh.getARequestExpr()) |
-        exists (string methodName |
+      exists(DataFlow::Node request | request = DataFlow::valueNode(rh.getARequestExpr()) |
+        exists(string methodName |
           // `req.get(...)` or `req.header(...)`
-          this.(DataFlow::MethodCallNode).calls(request, methodName) |
+          this.(DataFlow::MethodCallNode).calls(request, methodName)
+        |
           methodName = "get" or
           methodName = "header"
         )
         or
-        exists (DataFlow::PropRead headers |
+        exists(DataFlow::PropRead headers |
           // `req.headers.name`
           headers.accesses(request, "headers") and
-          this = headers.getAPropertyRead())
+          this = headers.getAPropertyRead()
+        )
         or
-        exists (string propName | propName = "host" or propName = "hostname" |
+        exists(string propName | propName = "host" or propName = "hostname" |
           // `req.host` and `req.hostname` are derived from headers
-          this.(DataFlow::PropRead).accesses(request, propName))
+          this.(DataFlow::PropRead).accesses(request, propName)
+        )
       )
     }
 
     override string getAHeaderName() {
-      exists (string name |
+      exists(string name |
         name = this.(DataFlow::PropRead).getPropertyName()
         or
         this.(DataFlow::CallNode).getArgument(0).mayHaveStringValue(name)
-        |
-        if name = "hostname" then
-          result = "host"
-        else
-          result = name.toLowerCase())
+      |
+        if name = "hostname" then result = "host" else result = name.toLowerCase()
+      )
     }
 
-    override RouteHandler getRouteHandler() {
-      result = rh
-    }
+    override RouteHandler getRouteHandler() { result = rh }
 
-    override string getKind() {
-      result = "header"
-    }
+    override string getKind() { result = "header" }
   }
 
   /**
    * HTTP headers created by Express calls
    */
-  private abstract class ExplicitHeader extends HTTP::ExplicitHeaderDefinition {
-
+  abstract private class ExplicitHeader extends HTTP::ExplicitHeaderDefinition {
     Expr response;
 
     /**
      * Gets the response expression that this header is set on.
      */
-    Expr getResponse() {
-      result = response
-    }
+    Expr getResponse() { result = response }
   }
 
   /**
    * Holds if `e` is an HTTP request object.
    */
-  predicate isRequest(Expr e) {
-    any(RouteHandler rh).getARequestExpr() = e
-  }
+  predicate isRequest(Expr e) { any(RouteHandler rh).getARequestExpr() = e }
 
   /**
    * Holds if `e` is an HTTP response object.
    */
-  predicate isResponse(Expr e) {
-    any(RouteHandler rh).getAResponseExpr() = e
-  }
+  predicate isResponse(Expr e) { any(RouteHandler rh).getAResponseExpr() = e }
 
   /**
    * An access to the HTTP request body.
    */
   class RequestBodyAccess extends Expr {
-
-    RequestBodyAccess() {
-      any(RouteHandler h).getARequestBodyAccess() = this
-    }
-
+    RequestBodyAccess() { any(RouteHandler h).getARequestBodyAccess() = this }
   }
 
-  private abstract class HeaderDefinition extends HTTP::Servers::StandardHeaderDefinition {
-    HeaderDefinition() {
-      isResponse(astNode.getReceiver())
-    }
+  abstract private class HeaderDefinition extends HTTP::Servers::StandardHeaderDefinition {
+    HeaderDefinition() { isResponse(astNode.getReceiver()) }
 
-    override RouteHandler getRouteHandler() {
-      astNode.getReceiver() = result.getAResponseExpr()
-    }
+    override RouteHandler getRouteHandler() { astNode.getReceiver() = result.getAResponseExpr() }
   }
 
   /**
@@ -625,13 +557,9 @@ module Express {
       getMethodName() = "redirect"
     }
 
-    override Expr getUrlArgument() {
-      result = getLastArgument()
-    }
+    override Expr getUrlArgument() { result = getLastArgument() }
 
-    override RouteHandler getRouteHandler() {
-      result = rh
-    }
+    override RouteHandler getRouteHandler() { result = rh }
   }
 
   /**
@@ -651,6 +579,7 @@ module Express {
    */
   class SetMultipleHeaders extends ExplicitHeader, DataFlow::ValueNode {
     override MethodCallExpr astNode;
+
     RouteHandler rh;
 
     SetMultipleHeaders() {
@@ -663,23 +592,19 @@ module Express {
     /**
      * Gets a reference to the multiple headers object that is to be set.
      */
-    private DataFlow::SourceNode getAHeaderSource() {
-      result.flowsToExpr(astNode.getArgument(0))
-    }
+    private DataFlow::SourceNode getAHeaderSource() { result.flowsToExpr(astNode.getArgument(0)) }
 
     override predicate definesExplicitly(string headerName, Expr headerValue) {
-      exists (string header |
+      exists(string header |
         getAHeaderSource().hasPropertyWrite(header, DataFlow::valueNode(headerValue)) and
         headerName = header.toLowerCase()
       )
     }
 
-    override RouteHandler getRouteHandler() {
-      result = rh
-    }
+    override RouteHandler getRouteHandler() { result = rh }
 
     override Expr getNameExpr() {
-      exists (DataFlow::PropWrite write  |
+      exists(DataFlow::PropWrite write |
         getAHeaderSource().flowsTo(write.getBase()) and
         result = write.getPropertyNameExpr()
       )
@@ -690,9 +615,7 @@ module Express {
    * An invocation of the `append` method on an HTTP response object.
    */
   private class AppendHeader extends HeaderDefinition {
-    AppendHeader() {
-      astNode.getMethodName() = "append"
-    }
+    AppendHeader() { astNode.getMethodName() = "append" }
   }
 
   /**
@@ -702,7 +625,7 @@ module Express {
     RouteHandler rh;
 
     ResponseSendArgument() {
-      exists (MethodCallExpr mce |
+      exists(MethodCallExpr mce |
         mce.calls(rh.getAResponseExpr(), "send") and
         this = mce.getArgument(0)
       )
@@ -717,12 +640,12 @@ module Express {
   private class SetCookie extends HTTP::CookieDefinition, MethodCallExpr {
     RouteHandler rh;
 
-    SetCookie() {
-      calls(rh.getAResponseExpr(), "cookie")
-    }
+    SetCookie() { calls(rh.getAResponseExpr(), "cookie") }
 
     override Expr getNameArgument() { result = getArgument(0) }
+
     override Expr getValueArgument() { result = getArgument(1) }
+
     override RouteHandler getRouteHandler() { result = rh }
   }
 
@@ -734,7 +657,7 @@ module Express {
     RouteHandler rh;
 
     TemplateInput() {
-      exists (DataFlow::MethodCallNode render |
+      exists(DataFlow::MethodCallNode render |
         render.calls(rh.getAResponseExpr().flow(), "render") and
         this = render.getOptionArgument(1, _).asExpr()
       )
@@ -747,10 +670,7 @@ module Express {
    * An Express server application.
    */
   private class Application extends HTTP::ServerDefinition, DataFlow::TrackedExpr {
-
-    Application() {
-      this = appCreation().asExpr()
-    }
+    Application() { this = appCreation().asExpr() }
 
     /**
      * Gets a route handler of the application, regardless of nesting.
@@ -758,33 +678,25 @@ module Express {
     override HTTP::RouteHandler getARouteHandler() {
       result = this.(RouterDefinition).getASubRouter*().getARouteHandler()
     }
-
   }
 
   /**
    * An Express router.
    */
   class RouterDefinition extends InvokeExpr, DataFlow::TrackedExpr {
-
-    RouterDefinition() {
-      this = routerCreation().asExpr()
-    }
+    RouterDefinition() { this = routerCreation().asExpr() }
 
     /**
      * Gets a `RouteSetup` that was used for setting up a route on this router.
      */
-    private RouteSetup getARouteSetup() {
-      this.flowsTo(result.getReceiver())
-    }
+    private RouteSetup getARouteSetup() { this.flowsTo(result.getReceiver()) }
 
     /**
      * Gets a sub-router registered on this router.
      *
      * Example: `router2` for `router1.use(router2)` or `router1.use("/route2", router2)`
      */
-    RouterDefinition getASubRouter() {
-      result.flowsTo(getARouteSetup().getAnArgument())
-    }
+    RouterDefinition getASubRouter() { result.flowsTo(getARouteSetup().getAnArgument()) }
 
     /**
      * Gets a route handler registered on this router.
@@ -811,10 +723,12 @@ module Express {
      * If `node` is not in the same container where `router` was defined, the predicate has no result.
      */
     Express::RouteHandlerExpr getMiddlewareStackAt(ControlFlowNode node) {
-      if exists (Express::RouteSetup setup | node = setup and setup.getRouter() = this | setup.isUseCall()) then
-        result = node.(Express::RouteSetup).getLastRouteHandlerExpr()
-      else
-        result = getMiddlewareStackAt(node.getAPredecessor())
+      if
+        exists(Express::RouteSetup setup | node = setup and setup.getRouter() = this |
+          setup.isUseCall()
+        )
+      then result = node.(Express::RouteSetup).getLastRouteHandlerExpr()
+      else result = getMiddlewareStackAt(node.getAPredecessor())
     }
 
     /**
@@ -827,16 +741,16 @@ module Express {
 
   /** An expression that is passed as `expressBasicAuth({ users: { <user>: <password> }})`. */
   class Credentials extends CredentialsExpr {
-
     string kind;
 
     Credentials() {
-      exists (DataFlow::CallNode call, DataFlow::ModuleImportNode mod |
+      exists(DataFlow::CallNode call, DataFlow::ModuleImportNode mod |
         mod.getPath() = "express-basic-auth" and
         call = mod.getAnInvocation() and
-        exists (DataFlow::ObjectLiteralNode usersSrc, DataFlow::PropWrite pwn |
+        exists(DataFlow::ObjectLiteralNode usersSrc, DataFlow::PropWrite pwn |
           usersSrc.flowsTo(call.getOptionArgument(0, "users")) and
-          usersSrc.flowsTo(pwn.getBase()) |
+          usersSrc.flowsTo(pwn.getBase())
+        |
           this = pwn.getPropertyNameExpr() and kind = "user name"
           or
           this = pwn.getRhs().asExpr() and kind = "password"
@@ -844,27 +758,21 @@ module Express {
       )
     }
 
-    override string getCredentialsKind() {
-      result = kind
-    }
-
+    override string getCredentialsKind() { result = kind }
   }
 
   /** A call to `response.sendFile`, considered as a file system access. */
-  private class ResponseSendFileAsFileSystemAccess extends FileSystemReadAccess, DataFlow::MethodCallNode {
+  private class ResponseSendFileAsFileSystemAccess extends FileSystemReadAccess,
+    DataFlow::MethodCallNode {
     ResponseSendFileAsFileSystemAccess() {
-      exists (string name | name = "sendFile" or name = "sendfile" |
+      exists(string name | name = "sendFile" or name = "sendfile" |
         calls(any(ResponseExpr res).flow(), name)
       )
     }
 
-    override DataFlow::Node getADataNode() {
-      none()
-    }
+    override DataFlow::Node getADataNode() { none() }
 
-    override DataFlow::Node getAPathArgument() {
-      result = getArgument(0)
-    }
+    override DataFlow::Node getAPathArgument() { result = getArgument(0) }
 
     override DataFlow::Node getRootPathArgument() {
       result = this.(DataFlow::CallNode).getOptionArgument(1, "root")
@@ -875,18 +783,14 @@ module Express {
    * Tracking for `RouteHandlerCandidate`.
    */
   private class TrackedRouteHandlerCandidate extends DataFlow::TrackedNode {
-
-    TrackedRouteHandlerCandidate() {
-      this instanceof RouteHandlerCandidate
-    }
-
+    TrackedRouteHandlerCandidate() { this instanceof RouteHandlerCandidate }
   }
 
   /**
    * A function that looks like an Express route handler and flows to a route setup.
    */
-  private class TrackedRouteHandlerCandidateWithSetup extends RouteHandler, HTTP::Servers::StandardRouteHandler, DataFlow::ValueNode {
-
+  private class TrackedRouteHandlerCandidateWithSetup extends RouteHandler,
+    HTTP::Servers::StandardRouteHandler, DataFlow::ValueNode {
     override Function astNode;
 
     TrackedRouteHandlerCandidateWithSetup() {
@@ -899,7 +803,6 @@ module Express {
     override SimpleParameter getRouteHandlerParameter(string kind) {
       result = getRouteHandlerParameter(astNode, kind)
     }
-
   }
 
   /**
@@ -910,29 +813,26 @@ module Express {
    * Express router.
    */
   class RouteSetupCandidate extends HTTP::RouteSetupCandidate, DataFlow::MethodCallNode {
-
     DataFlow::ValueNode routeHandlerArg;
 
     RouteSetupCandidate() {
-      exists (string methodName |
+      exists(string methodName |
         methodName = "all" or
         methodName = "use" or
-        methodName = any(HTTP::RequestMethodName m).toLowerCase() |
+        methodName = any(HTTP::RequestMethodName m).toLowerCase()
+      |
         getMethodName() = methodName and
-        exists (DataFlow::ValueNode arg |
-          arg = getAnArgument() |
-          exists (DataFlow::ArrayCreationNode array |
+        exists(DataFlow::ValueNode arg | arg = getAnArgument() |
+          exists(DataFlow::ArrayCreationNode array |
             array.flowsTo(arg) and
             routeHandlerArg = array.getAnElement()
-          ) or
+          )
+          or
           routeHandlerArg = arg
         )
       )
     }
 
-    override DataFlow::ValueNode getARouteHandlerArg() {
-      result = routeHandlerArg
-    }
+    override DataFlow::ValueNode getARouteHandlerArg() { result = routeHandlerArg }
   }
-
 }
diff --git a/javascript/ql/src/semmle/javascript/frameworks/ExpressModules.qll b/javascript/ql/src/semmle/javascript/frameworks/ExpressModules.qll
index 6f184880b163..0e621bb178b9 100644
--- a/javascript/ql/src/semmle/javascript/frameworks/ExpressModules.qll
+++ b/javascript/ql/src/semmle/javascript/frameworks/ExpressModules.qll
@@ -1,15 +1,17 @@
 /**
  * Models of npm modules that are used with Express servers.
  */
+
 import javascript
 import semmle.javascript.frameworks.HTTP
 
 module ExpressLibraries {
-
   /**
-  * Holds if `headerName` and `headerValue` corresponds to a default "X-Frame-Options" HTTP header.
-  */
-  private predicate xFrameOptionsDefaultImplicitHeaderDefinition(string headerName, string headerValue) {
+   * Holds if `headerName` and `headerValue` corresponds to a default "X-Frame-Options" HTTP header.
+   */
+  private predicate xFrameOptionsDefaultImplicitHeaderDefinition(
+    string headerName, string headerValue
+  ) {
     headerName = "x-frame-options" and headerValue = "DENY"
   }
 
@@ -17,18 +19,13 @@ module ExpressLibraries {
    * Header produced by a route handler of the "x-frame-options" module.
    */
   class XFrameOptionsRouteHandlerHeader extends HTTP::ImplicitHeaderDefinition {
-
-    XFrameOptionsRouteHandlerHeader() {
-      this instanceof XFrameOptionsRouteHandler
-    }
+    XFrameOptionsRouteHandlerHeader() { this instanceof XFrameOptionsRouteHandler }
 
     override predicate defines(string headerName, string headerValue) {
       xFrameOptionsDefaultImplicitHeaderDefinition(headerName, headerValue)
     }
 
-    override HTTP::RouteHandler getRouteHandler() {
-      result = this
-    }
+    override HTTP::RouteHandler getRouteHandler() { result = this }
   }
 
   /**
@@ -43,60 +40,44 @@ module ExpressLibraries {
       name = this.(XFrameOptionsRouteHandlerHeader).getAHeaderName() and
       result = this
     }
-
   }
 
-
   /**
    * Header produced by a route handler of the "frameguard" module.
    */
   class FrameGuardRouteHandlerHeader extends HTTP::ImplicitHeaderDefinition {
-
-    FrameGuardRouteHandlerHeader() {
-      this instanceof FrameGuardRouteHandler
-    }
+    FrameGuardRouteHandlerHeader() { this instanceof FrameGuardRouteHandler }
 
     override predicate defines(string headerName, string headerValue) {
       xFrameOptionsDefaultImplicitHeaderDefinition(headerName, headerValue)
     }
 
-    override HTTP::RouteHandler getRouteHandler() {
-      result = this
-    }
+    override HTTP::RouteHandler getRouteHandler() { result = this }
   }
 
   /**
    * Route handler from the "frameguard" module.
    */
   class FrameGuardRouteHandler extends HTTP::RouteHandler {
-    FrameGuardRouteHandler() {
-      this = DataFlow::moduleImport("frameguard").getAnInvocation()
-    }
+    FrameGuardRouteHandler() { this = DataFlow::moduleImport("frameguard").getAnInvocation() }
 
     override HTTP::HeaderDefinition getAResponseHeader(string name) {
       name = this.(FrameGuardRouteHandlerHeader).getAHeaderName() and
       result = this
     }
-
   }
 
-
   /**
    * Header produced by a route handler of the "helmet" module.
    */
   class HelmetRouteHandlerHeader extends HTTP::ImplicitHeaderDefinition {
-
-    HelmetRouteHandlerHeader() {
-      this instanceof HelmetRouteHandler
-    }
+    HelmetRouteHandlerHeader() { this instanceof HelmetRouteHandler }
 
     override predicate defines(string headerName, string headerValue) {
       xFrameOptionsDefaultImplicitHeaderDefinition(headerName, headerValue)
     }
 
-    override HTTP::RouteHandler getRouteHandler() {
-      result = this
-    }
+    override HTTP::RouteHandler getRouteHandler() { result = this }
   }
 
   /**
@@ -104,8 +85,8 @@ module ExpressLibraries {
    */
   class HelmetRouteHandler extends HTTP::RouteHandler {
     HelmetRouteHandler() {
-      exists (DataFlow::ModuleImportNode m | "helmet" = m.getPath() |
-        this = m.getAnInvocation()  or
+      exists(DataFlow::ModuleImportNode m | "helmet" = m.getPath() |
+        this = m.getAnInvocation() or
         this = m.getAMemberInvocation("frameguard")
       )
     }
@@ -114,14 +95,12 @@ module ExpressLibraries {
       name = this.(HelmetRouteHandlerHeader).getAHeaderName() and
       result = this
     }
-
   }
 
   /**
    * Provides classes for working with the `express-session` package (https://github.com/expressjs/session);
    */
   module ExpressSession {
-
     private DataFlow::SourceNode expressSession() {
       result = DataFlow::moduleImport("express-session")
     }
@@ -130,74 +109,54 @@ module ExpressLibraries {
      * A call that creates an `express-session` middleware instance.
      */
     class MiddlewareInstance extends DataFlow::InvokeNode, HTTP::CookieMiddlewareInstance {
-
-      MiddlewareInstance() {
-        this = expressSession().getACall()
-      }
+      MiddlewareInstance() { this = expressSession().getACall() }
 
       /**
        * Gets the expression for property `name` of the options object of this call.
        */
-      DataFlow::Node getOption(string name) {
-        result = getOptionArgument(0, name)
-      }
+      DataFlow::Node getOption(string name) { result = getOptionArgument(0, name) }
 
       override DataFlow::Node getASecretKey() {
-        exists (DataFlow::Node secret | secret = getOption("secret") |
-          if exists(DataFlow::ArrayCreationNode arr | arr.flowsTo(secret)) then
-            result = any (DataFlow::ArrayCreationNode arr | arr.flowsTo(secret)).getAnElement()
-          else
-            result = secret
+        exists(DataFlow::Node secret | secret = getOption("secret") |
+          if exists(DataFlow::ArrayCreationNode arr | arr.flowsTo(secret))
+          then result = any(DataFlow::ArrayCreationNode arr | arr.flowsTo(secret)).getAnElement()
+          else result = secret
         )
       }
-
     }
-
   }
 
   /**
    * Provides classes for working with the `cookie-parser` package (https://github.com/expressjs/cookie-parser);
    */
   module CookieParser {
-
-    private DataFlow::SourceNode cookieParser() {
-      result = DataFlow::moduleImport("cookie-parser")
-    }
+    private DataFlow::SourceNode cookieParser() { result = DataFlow::moduleImport("cookie-parser") }
 
     /**
      * A call that creates a `cookie-parser` middleware instance.
      */
     class MiddlewareInstance extends DataFlow::InvokeNode, HTTP::CookieMiddlewareInstance {
-
-      MiddlewareInstance() {
-        this = cookieParser().getACall()
-      }
+      MiddlewareInstance() { this = cookieParser().getACall() }
 
       /**
        * Gets the expression for property `name` of the options object of this call.
        */
-      DataFlow::Node getOption(string name) {
-        result = getOptionArgument(1, name)
-      }
+      DataFlow::Node getOption(string name) { result = getOptionArgument(1, name) }
 
       override DataFlow::Node getASecretKey() {
-        exists (DataFlow::Node arg0 | arg0 = getArgument(0) |
-          if exists(DataFlow::ArrayCreationNode arr | arr.flowsTo(arg0)) then
-            result = any (DataFlow::ArrayCreationNode arr | arr.flowsTo(arg0)).getAnElement()
-          else
-            result = arg0
+        exists(DataFlow::Node arg0 | arg0 = getArgument(0) |
+          if exists(DataFlow::ArrayCreationNode arr | arr.flowsTo(arg0))
+          then result = any(DataFlow::ArrayCreationNode arr | arr.flowsTo(arg0)).getAnElement()
+          else result = arg0
         )
       }
-
     }
-
   }
 
   /**
    * Provides classes for working with the `cookie-session` package (https://github.com/expressjs/cookie-session);
    */
   module CookieSession {
-
     private DataFlow::SourceNode cookieSession() {
       result = DataFlow::moduleImport("cookie-session")
     }
@@ -206,28 +165,22 @@ module ExpressLibraries {
      * A call that creates a `cookie-session` middleware instance.
      */
     class MiddlewareInstance extends DataFlow::InvokeNode, HTTP::CookieMiddlewareInstance {
-
-      MiddlewareInstance() {
-        this = cookieSession().getACall()
-      }
+      MiddlewareInstance() { this = cookieSession().getACall() }
 
       /**
        * Gets the expression for property `name` of the options object of this call.
        */
-      DataFlow::Node getOption(string name) {
-        result = getOptionArgument(0, name)
-      }
+      DataFlow::Node getOption(string name) { result = getOptionArgument(0, name) }
 
       override DataFlow::Node getASecretKey() {
-        result = getOption("secret") or
-        exists (DataFlow::ArrayCreationNode keys |
+        result = getOption("secret")
+        or
+        exists(DataFlow::ArrayCreationNode keys |
           keys.flowsTo(getOption("keys")) and
           result = keys.getAnElement()
         )
       }
-
     }
-
   }
 
   /**
@@ -239,7 +192,7 @@ module ExpressLibraries {
     BodyParser() {
       this = DataFlow::moduleImport("body-parser").getACall() and kind = "json"
       or
-      exists (string moduleName |
+      exists(string moduleName |
         (moduleName = "body-parser" or moduleName = "express") and
         (kind = "json" or kind = "urlencoded") and
         this = DataFlow::moduleMember(moduleName, kind).getACall()
@@ -249,16 +202,12 @@ module ExpressLibraries {
     /**
      * Holds if this is a JSON body parser.
      */
-    predicate isJson() {
-      kind = "json"
-    }
+    predicate isJson() { kind = "json" }
 
     /**
      * Holds if this is a URL-encoded body parser.
      */
-    predicate isUrlEncoded() {
-      kind = "urlencoded"
-    }
+    predicate isUrlEncoded() { kind = "urlencoded" }
 
     /**
      * Holds if this is an extended URL-encoded body parser.
@@ -274,9 +223,6 @@ module ExpressLibraries {
      * Holds if this parses the input as JSON or extended URL-encoding, resulting
      * in user-controlled objects (as opposed to user-controlled strings).
      */
-    predicate producesUserControlledObjects() {
-      isJson() or isExtendedUrlEncoded()
-    }
+    predicate producesUserControlledObjects() { isJson() or isExtendedUrlEncoded() }
   }
-
 }
diff --git a/javascript/ql/src/semmle/javascript/frameworks/Files.qll b/javascript/ql/src/semmle/javascript/frameworks/Files.qll
index 0138e8531fb9..efb705ddef23 100644
--- a/javascript/ql/src/semmle/javascript/frameworks/Files.qll
+++ b/javascript/ql/src/semmle/javascript/frameworks/Files.qll
@@ -8,96 +8,98 @@ import javascript
  * A file name from the `walk-sync` library.
  */
 private class WalkSyncFileNameSource extends FileNameSource {
-
   WalkSyncFileNameSource() {
     // `require('walkSync')()`
     this = DataFlow::moduleImport("walkSync").getACall()
   }
-
 }
 
 /**
  * A file name or an array of file names from the `walk` library.
  */
 private class WalkFileNameSource extends FileNameSource {
-
   WalkFileNameSource() {
     // `stats.name` in `require('walk').walk(_).on(_,  (_, stats) => stats.name)`
-    exists (DataFlow::FunctionNode callback |
-      callback = DataFlow::moduleMember("walk", "walk").getACall().getAMethodCall("on").getCallback(1) |
+    exists(DataFlow::FunctionNode callback |
+      callback = DataFlow::moduleMember("walk", "walk")
+            .getACall()
+            .getAMethodCall("on")
+            .getCallback(1)
+    |
       this = callback.getParameter(1).getAPropertyRead("name")
     )
   }
-
 }
 
 /**
  * A file name or an array of file names from the `glob` library.
  */
 private class GlobFileNameSource extends FileNameSource {
-
   GlobFileNameSource() {
-    exists (string moduleName |
-      moduleName = "glob" |
+    exists(string moduleName | moduleName = "glob" |
       // `require('glob').sync(_)`
       this = DataFlow::moduleMember(moduleName, "sync").getACall()
       or
       // `name` in `require('glob')(_, (e, name) => ...)`
-      this = DataFlow::moduleImport(moduleName).getACall().getCallback([1..2]).getParameter(1)
+      this = DataFlow::moduleImport(moduleName).getACall().getCallback([1 .. 2]).getParameter(1)
       or
-      exists (DataFlow::NewNode instance |
-        instance = DataFlow::moduleMember(moduleName, "Glob").getAnInstantiation() |
+      exists(DataFlow::NewNode instance |
+        instance = DataFlow::moduleMember(moduleName, "Glob").getAnInstantiation()
+      |
         // `name` in `new require('glob').Glob(_, (e, name) => ...)`
-        this = instance.getCallback([1..2]).getParameter(1) or
+        this = instance.getCallback([1 .. 2]).getParameter(1)
+        or
         // `new require('glob').Glob(_).found`
         this = instance.getAPropertyRead("found")
       )
     )
   }
-
 }
 
 /**
  * A file name or an array of file names from the `globby` library.
  */
 private class GlobbyFileNameSource extends FileNameSource {
-
   GlobbyFileNameSource() {
-    exists (string moduleName |
-      moduleName = "globby" |
+    exists(string moduleName | moduleName = "globby" |
       // `require('globby').sync(_)`
       this = DataFlow::moduleMember(moduleName, "sync").getACall()
       or
       // `files` in `require('globby')(_).then(files => ...)`
-      this = DataFlow::moduleImport(moduleName).getACall().getAMethodCall("then").getCallback(0).getParameter(0)
+      this = DataFlow::moduleImport(moduleName)
+            .getACall()
+            .getAMethodCall("then")
+            .getCallback(0)
+            .getParameter(0)
     )
   }
-
 }
 
 /**
  * A file name or an array of file names from the `fast-glob` library.
  */
 private class FastGlobFileNameSource extends FileNameSource {
-
   FastGlobFileNameSource() {
-    exists (string moduleName |
-      moduleName = "fast-glob" |
+    exists(string moduleName | moduleName = "fast-glob" |
       // `require('fast-glob').sync(_)`
       this = DataFlow::moduleMember(moduleName, "sync").getACall()
       or
-      exists (DataFlow::SourceNode f |
+      exists(DataFlow::SourceNode f |
         f = DataFlow::moduleImport(moduleName)
         or
-        f = DataFlow::moduleMember(moduleName, "async") |
+        f = DataFlow::moduleMember(moduleName, "async")
+      |
         // `files` in `require('fast-glob')(_).then(files => ...)` and
         // `files` in `require('fast-glob').async(_).then(files => ...)`
         this = f.getACall().getAMethodCall("then").getCallback(0).getParameter(0)
       )
       or
       // `file` in `require('fast-glob').stream(_).on(_,  file => ...)`
-      this = DataFlow::moduleMember(moduleName, "stream").getACall().getAMethodCall("on").getCallback(1).getParameter(0)
+      this = DataFlow::moduleMember(moduleName, "stream")
+            .getACall()
+            .getAMethodCall("on")
+            .getCallback(1)
+            .getParameter(0)
     )
   }
-
 }
diff --git a/javascript/ql/src/semmle/javascript/frameworks/GWT.qll b/javascript/ql/src/semmle/javascript/frameworks/GWT.qll
index cee155a23f5c..608f3d8b1fd2 100644
--- a/javascript/ql/src/semmle/javascript/frameworks/GWT.qll
+++ b/javascript/ql/src/semmle/javascript/frameworks/GWT.qll
@@ -8,9 +8,7 @@ import javascript
  * A `$gwt_version` variable.
  */
 class GWTVersionVariable extends GlobalVariable {
-  GWTVersionVariable() {
-    getName() = "$gwt_version"
-  }
+  GWTVersionVariable() { getName() = "$gwt_version" }
 }
 
 /**
@@ -18,16 +16,14 @@ class GWTVersionVariable extends GlobalVariable {
  */
 class GWTHeader extends InlineScript {
   GWTHeader() {
-    exists (GWTVersionVariable gwtVersion |
-      gwtVersion.getADeclaration().getTopLevel() = this
-    )
+    exists(GWTVersionVariable gwtVersion | gwtVersion.getADeclaration().getTopLevel() = this)
   }
 
   /**
    * Gets the GWT version this script was generated with, if it can be determined.
    */
   string getGWTVersion() {
-    exists (Expr e | e.getTopLevel() = this |
+    exists(Expr e | e.getTopLevel() = this |
       e = any(GWTVersionVariable v).getAnAssignedExpr() and
       result = e.getStringValue()
     )
@@ -38,7 +34,5 @@ class GWTHeader extends InlineScript {
  * A toplevel in a file that appears to be GWT-generated.
  */
 class GWTGeneratedTopLevel extends TopLevel {
-  GWTGeneratedTopLevel() {
-    exists (GWTHeader h | getFile() = h.getFile())
-  }
+  GWTGeneratedTopLevel() { exists(GWTHeader h | getFile() = h.getFile()) }
 }
diff --git a/javascript/ql/src/semmle/javascript/frameworks/HTTP.qll b/javascript/ql/src/semmle/javascript/frameworks/HTTP.qll
index d0294f1e512e..66d5bae18c4c 100644
--- a/javascript/ql/src/semmle/javascript/frameworks/HTTP.qll
+++ b/javascript/ql/src/semmle/javascript/frameworks/HTTP.qll
@@ -41,25 +41,18 @@ module HTTP {
     abstract RouteHandler getRouteHandler();
   }
 
-
   /**
    * An expression that sets HTTP response headers implicitly.
    */
   abstract class ImplicitHeaderDefinition extends HeaderDefinition {
-
-    override string getAHeaderName() {
-      defines(result, _)
-    }
+    override string getAHeaderName() { defines(result, _) }
   }
 
   /**
    * An expression that sets HTTP response headers explicitly.
    */
   abstract class ExplicitHeaderDefinition extends HeaderDefinition {
-
-    override string getAHeaderName() {
-      definesExplicitly(result, _)
-    }
+    override string getAHeaderName() { definesExplicitly(result, _) }
 
     override predicate defines(string headerName, string headerValue) {
       exists(Expr e |
@@ -128,9 +121,7 @@ module HTTP {
   /**
    * Gets the string `http` or `https`.
    */
-  string httpOrHttps() {
-    result = "http" or result = "https"
-  }
+  string httpOrHttps() { result = "http" or result = "https" }
 
   /**
    * An expression whose value is sent as (part of) the body of an HTTP response.
@@ -146,8 +137,7 @@ module HTTP {
    * An expression whose value is included directly (and not, say, via a template)
    * in the body of an HTTP response.
    */
-  abstract class ResponseSendArgument extends ResponseBody {
-  }
+  abstract class ResponseSendArgument extends ResponseBody { }
 
   /**
    * An expression that sets a cookie in an HTTP response.
@@ -187,9 +177,7 @@ module HTTP {
       header.(ExplicitHeaderDefinition).definesExplicitly("set-cookie", result)
     }
 
-    override RouteHandler getRouteHandler() {
-      result = header.getRouteHandler()
-    }
+    override RouteHandler getRouteHandler() { result = header.getRouteHandler() }
   }
 
   /**
@@ -218,24 +206,19 @@ module HTTP {
      * Gets an expression that contains a request object handled
      * by this handler.
      */
-    RequestExpr getARequestExpr() {
-      result.getRouteHandler() = this
-    }
+    RequestExpr getARequestExpr() { result.getRouteHandler() = this }
 
     /**
      * Gets an expression that contains a response object provided
      * by this handler.
      */
-    ResponseExpr getAResponseExpr() {
-      result.getRouteHandler() = this
-    }
+    ResponseExpr getAResponseExpr() { result.getRouteHandler() = this }
   }
 
   /**
    * An expression that sets up a route on a server.
    */
-  abstract class RouteSetup extends Expr {
-  }
+  abstract class RouteSetup extends Expr { }
 
   /**
    * An expression that may contain a request object.
@@ -257,22 +240,16 @@ module HTTP {
     abstract RouteHandler getRouteHandler();
   }
 
-
   /**
    * Boiler-plate implementation of a `Server` and its associated classes.
    * Made for easily defining new HTTP servers
    */
   module Servers {
-
     /**
      * A standard server definition.
      */
     abstract class StandardServerDefinition extends ServerDefinition, DataFlow::TrackedExpr {
-
-      override RouteHandler getARouteHandler() {
-        result.(StandardRouteHandler).getServer() = this
-      }
-
+      override RouteHandler getARouteHandler() { result.(StandardRouteHandler).getServer() = this }
     }
 
     /**
@@ -288,7 +265,7 @@ module HTTP {
        * Gets the server this route handler is registered on.
        */
       Expr getServer() {
-        exists (StandardRouteSetup setup | setup.getARouteHandler() = this |
+        exists(StandardRouteSetup setup | setup.getARouteHandler() = this |
           result = setup.getServer()
         )
       }
@@ -326,9 +303,7 @@ module HTTP {
 
       StandardRequestExpr() { src.flowsTo(DataFlow::valueNode(this)) }
 
-      override RouteHandler getRouteHandler() {
-        result = src.getRouteHandler()
-      }
+      override RouteHandler getRouteHandler() { result = src.getRouteHandler() }
     }
 
     /**
@@ -339,9 +314,7 @@ module HTTP {
 
       StandardResponseExpr() { src.flowsTo(DataFlow::valueNode(this)) }
 
-      override RouteHandler getRouteHandler() {
-        result = src.getRouteHandler()
-      }
+      override RouteHandler getRouteHandler() { result = src.getRouteHandler() }
     }
 
     /**
@@ -355,17 +328,13 @@ module HTTP {
         headerValue = astNode.getArgument(1)
       }
 
-      override Expr getNameExpr() {
-         result = astNode.getArgument(0)
-      }
-
+      override Expr getNameExpr() { result = astNode.getArgument(0) }
     }
 
     /**
      * A standard route setup on a server.
      */
     abstract class StandardRouteSetup extends RouteSetup {
-
       /**
        * Gets a route handler that is defined by this setup.
        */
@@ -376,16 +345,13 @@ module HTTP {
        */
       abstract Expr getServer();
     }
-
   }
 
   /**
    * An access to a user-controlled HTTP request input.
    */
   abstract class RequestInputAccess extends RemoteFlowSource {
-    override string getSourceType() {
-      result = "Server request " + getKind()
-    }
+    override string getSourceType() { result = "Server request " + getKind() }
 
     /**
      * Gets the route handler whose request input is accessed.
@@ -417,10 +383,11 @@ module HTTP {
      * third party does have some control over the the Referer and Origin headers.
      */
     predicate isThirdPartyControllable() {
-      exists (string kind | kind = getKind() |
+      exists(string kind | kind = getKind() |
         kind = "parameter" or
         kind = "url" or
-        kind = "body")
+        kind = "body"
+      )
     }
   }
 
@@ -444,7 +411,6 @@ module HTTP {
    * and exploratory queries.
    */
   abstract class RouteSetupCandidate extends DataFlow::ValueNode {
-
     /**
      * Gets an expression that contains a route handler of this setup.
      */
@@ -457,29 +423,22 @@ module HTTP {
    * This is useful for tasks such as heuristic analyses
    * and exploratory queries.
    */
-  abstract class RouteHandlerCandidate extends DataFlow::FunctionNode {
-  }
+  abstract class RouteHandlerCandidate extends DataFlow::FunctionNode { }
 
   /**
    * An expression that creates a route handler that parses cookies
    */
   abstract class CookieMiddlewareInstance extends DataFlow::SourceNode {
-
     /**
      * Gets a secret key used for signed cookies.
      */
     abstract DataFlow::Node getASecretKey();
-
   }
 
   /**
    * A key used for signed cookies, viewed as a `CryptographicKey`.
    */
   class CookieCryptographicKey extends CryptographicKey {
-
-    CookieCryptographicKey() {
-      this = any(CookieMiddlewareInstance instance).getASecretKey()
-    }
-
+    CookieCryptographicKey() { this = any(CookieMiddlewareInstance instance).getASecretKey() }
   }
 }
diff --git a/javascript/ql/src/semmle/javascript/frameworks/Hapi.qll b/javascript/ql/src/semmle/javascript/frameworks/Hapi.qll
index 2d3c8a2071b8..fcb6c5ff6348 100644
--- a/javascript/ql/src/semmle/javascript/frameworks/Hapi.qll
+++ b/javascript/ql/src/semmle/javascript/frameworks/Hapi.qll
@@ -1,6 +1,7 @@
 /**
  * Provides classes for working with [Hapi](https://hapijs.com/) servers.
  */
+
 import javascript
 import semmle.javascript.frameworks.HTTP
 
@@ -19,7 +20,6 @@ module Hapi {
    * A Hapi route handler.
    */
   class RouteHandler extends HTTP::Servers::StandardRouteHandler, DataFlow::ValueNode {
-
     Function function;
 
     RouteHandler() {
@@ -30,9 +30,7 @@ module Hapi {
     /**
      * Gets the parameter of the route handler that contains the request object.
      */
-    SimpleParameter getRequestParameter() {
-      result = function.getParameter(0)
-    }
+    SimpleParameter getRequestParameter() { result = function.getParameter(0) }
   }
 
   /**
@@ -42,16 +40,12 @@ module Hapi {
   private class ResponseSource extends HTTP::Servers::ResponseSource {
     RequestExpr req;
 
-    ResponseSource() {
-      asExpr().(PropAccess).accesses(req, "response")
-    }
+    ResponseSource() { asExpr().(PropAccess).accesses(req, "response") }
 
     /**
      * Gets the route handler that provides this response.
      */
-    override RouteHandler getRouteHandler() {
-      result = req.getRouteHandler()
-    }
+    override RouteHandler getRouteHandler() { result = req.getRouteHandler() }
   }
 
   /**
@@ -61,86 +55,77 @@ module Hapi {
   private class RequestSource extends HTTP::Servers::RequestSource {
     RouteHandler rh;
 
-    RequestSource() {
-      this = DataFlow::parameterNode(rh.getRequestParameter())
-    }
+    RequestSource() { this = DataFlow::parameterNode(rh.getRequestParameter()) }
 
     /**
      * Gets the route handler that handles this request.
      */
-    override RouteHandler getRouteHandler() {
-      result = rh
-    }
+    override RouteHandler getRouteHandler() { result = rh }
   }
 
   /**
    * A Hapi response expression.
    */
-  class ResponseExpr extends HTTP::Servers::StandardResponseExpr {
-    override ResponseSource src;
-  }
+  class ResponseExpr extends HTTP::Servers::StandardResponseExpr { override ResponseSource src; }
 
   /**
    * An Hapi request expression.
    */
-  class RequestExpr extends HTTP::Servers::StandardRequestExpr {
-    override RequestSource src;
-  }
+  class RequestExpr extends HTTP::Servers::StandardRequestExpr { override RequestSource src; }
 
   /**
    * An access to a user-controlled Hapi request input.
    */
   private class RequestInputAccess extends HTTP::RequestInputAccess {
     RouteHandler rh;
+
     string kind;
 
     RequestInputAccess() {
-      exists (Expr request | request = rh.getARequestExpr() |
+      exists(Expr request | request = rh.getARequestExpr() |
         kind = "body" and
         (
           // `request.rawPayload`
-          this.asExpr().(PropAccess).accesses(request, "rawPayload") or
-          exists (PropAccess payload |
+          this.asExpr().(PropAccess).accesses(request, "rawPayload")
+          or
+          exists(PropAccess payload |
             // `request.payload.name`
-            payload.accesses(request, "payload")  and
+            payload.accesses(request, "payload") and
             this.asExpr().(PropAccess).accesses(payload, _)
           )
         )
         or
         kind = "parameter" and
-        exists (PropAccess query |
+        exists(PropAccess query |
           // `request.query.name`
-          query.accesses(request, "query")  and
+          query.accesses(request, "query") and
           this.asExpr().(PropAccess).accesses(query, _)
         )
         or
-        exists (PropAccess url |
+        exists(PropAccess url |
           // `request.url.path`
           kind = "url" and
-          url.accesses(request, "url")  and
+          url.accesses(request, "url") and
           this.asExpr().(PropAccess).accesses(url, "path")
         )
         or
-        exists (PropAccess state |
+        exists(PropAccess state |
           // `request.state.<name>`
           kind = "cookie" and
-          state.accesses(request, "state")  and
+          state.accesses(request, "state") and
           this.asExpr().(PropAccess).accesses(state, _)
         )
       )
       or
-      exists (RequestHeaderAccess access | this = access |
+      exists(RequestHeaderAccess access | this = access |
         rh = access.getRouteHandler() and
-        kind = "header")
+        kind = "header"
+      )
     }
 
-    override RouteHandler getRouteHandler() {
-      result = rh
-    }
+    override RouteHandler getRouteHandler() { result = rh }
 
-    override string getKind() {
-      result = kind
-    }
+    override string getKind() { result = kind }
   }
 
   /**
@@ -150,10 +135,10 @@ module Hapi {
     RouteHandler rh;
 
     RequestHeaderAccess() {
-      exists (Expr request | request = rh.getARequestExpr() |
-        exists (PropAccess headers |
+      exists(Expr request | request = rh.getARequestExpr() |
+        exists(PropAccess headers |
           // `request.headers.<name>`
-          headers.accesses(request, "headers")  and
+          headers.accesses(request, "headers") and
           this.asExpr().(PropAccess).accesses(headers, _)
         )
       )
@@ -163,13 +148,9 @@ module Hapi {
       result = this.(DataFlow::PropRead).getPropertyName().toLowerCase()
     }
 
-    override RouteHandler getRouteHandler() {
-      result = rh
-    }
+    override RouteHandler getRouteHandler() { result = rh }
 
-    override string getKind() {
-      result = "header"
-    }
+    override string getKind() { result = "header" }
   }
 
   /**
@@ -183,10 +164,7 @@ module Hapi {
       astNode.calls(res, "header")
     }
 
-    override RouteHandler getRouteHandler(){
-      result = res.getRouteHandler()
-    }
-
+    override RouteHandler getRouteHandler() { result = res.getRouteHandler() }
   }
 
   /**
@@ -194,6 +172,7 @@ module Hapi {
    */
   class RouteSetup extends MethodCallExpr, HTTP::Servers::StandardRouteSetup {
     ServerDefinition server;
+
     Expr handler;
 
     RouteSetup() {
@@ -214,13 +193,9 @@ module Hapi {
       result.(DataFlow::TrackedNode).flowsTo(handler.flow())
     }
 
-    Expr getRouteHandlerExpr() {
-      result = handler
-    }
+    Expr getRouteHandlerExpr() { result = handler }
 
-    override Expr getServer() {
-      result = server
-    }
+    override Expr getServer() { result = server }
   }
 
   /**
@@ -229,15 +204,15 @@ module Hapi {
    * For example, this could be the function `function(request, h){...}`.
    */
   class RouteHandlerCandidate extends HTTP::RouteHandlerCandidate {
-
     RouteHandlerCandidate() {
-      exists (string request, string responseToolkit |
+      exists(string request, string responseToolkit |
         (request = "request" or request = "req") and
         responseToolkit = "h" and
         // heuristic: parameter names match the Hapi documentation
         astNode.getNumParameter() = 2 and
         astNode.getParameter(0).getName() = request and
-        astNode.getParameter(1).getName() = responseToolkit |
+        astNode.getParameter(1).getName() = responseToolkit
+      |
         not (
           // heuristic: is not invoked (Hapi invokes this at a call site we cannot reason precisely about)
           exists(DataFlow::InvokeNode cs | cs.getACallee() = astNode)
@@ -250,18 +225,14 @@ module Hapi {
    * Tracking for `RouteHandlerCandidate`.
    */
   private class TrackedRouteHandlerCandidate extends DataFlow::TrackedNode {
-
-    TrackedRouteHandlerCandidate() {
-      this instanceof RouteHandlerCandidate
-    }
-
+    TrackedRouteHandlerCandidate() { this instanceof RouteHandlerCandidate }
   }
 
   /**
    * A function that looks like a Hapi route handler and flows to a route setup.
    */
-  private class TrackedRouteHandlerCandidateWithSetup extends RouteHandler, HTTP::Servers::StandardRouteHandler, DataFlow::ValueNode {
-
+  private class TrackedRouteHandlerCandidateWithSetup extends RouteHandler,
+    HTTP::Servers::StandardRouteHandler, DataFlow::ValueNode {
     override Function astNode;
 
     TrackedRouteHandlerCandidateWithSetup() {
@@ -270,7 +241,5 @@ module Hapi {
         this = tracked
       )
     }
-
   }
-
 }
diff --git a/javascript/ql/src/semmle/javascript/frameworks/Koa.qll b/javascript/ql/src/semmle/javascript/frameworks/Koa.qll
index 33d8e95d52b6..c36256a516bd 100644
--- a/javascript/ql/src/semmle/javascript/frameworks/Koa.qll
+++ b/javascript/ql/src/semmle/javascript/frameworks/Koa.qll
@@ -1,6 +1,7 @@
 /**
  * Provides classes for working with [Koa](https://koajs.com) applications.
  */
+
 import javascript
 import semmle.javascript.frameworks.HTTP
 
@@ -29,9 +30,7 @@ module Koa {
       astNode.calls(rh.getAResponseExpr(), "header")
     }
 
-    override RouteHandler getRouteHandler(){
-      result = rh
-    }
+    override RouteHandler getRouteHandler() { result = rh }
   }
 
   /**
@@ -48,9 +47,7 @@ module Koa {
     /**
      * Gets the parameter of the route handler that contains the context object.
      */
-    SimpleParameter getContextParameter() {
-      result = function.getParameter(0)
-    }
+    SimpleParameter getContextParameter() { result = function.getParameter(0) }
 
     /**
      * Gets an expression that contains the "context" object of
@@ -60,9 +57,7 @@ module Koa {
      * `this` or `ctx`, given as the first and only argument to the
      * route handler.
      */
-    Expr getAContextExpr() {
-      result.(ContextExpr).getRouteHandler() = this
-    }
+    Expr getAContextExpr() { result.(ContextExpr).getRouteHandler() = this }
   }
 
   /**
@@ -81,9 +76,7 @@ module Koa {
     /**
      * Gets the route handler that handles this request.
      */
-    RouteHandler getRouteHandler() {
-      result = rh
-    }
+    RouteHandler getRouteHandler() { result = rh }
   }
 
   /**
@@ -93,16 +86,12 @@ module Koa {
   private class RequestSource extends HTTP::Servers::RequestSource {
     ContextExpr ctx;
 
-    RequestSource() {
-      asExpr().(PropAccess).accesses(ctx, "request")
-    }
+    RequestSource() { asExpr().(PropAccess).accesses(ctx, "request") }
 
     /**
      * Gets the route handler that provides this response.
      */
-    override RouteHandler getRouteHandler() {
-      result = ctx.getRouteHandler()
-    }
+    override RouteHandler getRouteHandler() { result = ctx.getRouteHandler() }
   }
 
   /**
@@ -112,16 +101,12 @@ module Koa {
   private class ResponseSource extends HTTP::Servers::ResponseSource {
     ContextExpr ctx;
 
-    ResponseSource() {
-      asExpr().(PropAccess).accesses(ctx, "response")
-    }
+    ResponseSource() { asExpr().(PropAccess).accesses(ctx, "response") }
 
     /**
      * Gets the route handler that provides this response.
      */
-    override RouteHandler getRouteHandler() {
-      result = ctx.getRouteHandler()
-    }
+    override RouteHandler getRouteHandler() { result = ctx.getRouteHandler() }
   }
 
   /**
@@ -135,34 +120,29 @@ module Koa {
     /**
      * Gets the route handler that provides this response.
      */
-    RouteHandler getRouteHandler() {
-      result = src.getRouteHandler()
-    }
+    RouteHandler getRouteHandler() { result = src.getRouteHandler() }
   }
 
   /**
    * An expression that may hold a Koa request object.
    */
-  class RequestExpr extends HTTP::Servers::StandardRequestExpr {
-    override RequestSource src;
-  }
+  class RequestExpr extends HTTP::Servers::StandardRequestExpr { override RequestSource src; }
 
   /**
    * An expression that may hold a Koa response object.
    */
-  class ResponseExpr extends HTTP::Servers::StandardResponseExpr {
-    override ResponseSource src;
-  }
+  class ResponseExpr extends HTTP::Servers::StandardResponseExpr { override ResponseSource src; }
 
   /**
    * An access to a user-controlled Koa request input.
    */
   private class RequestInputAccess extends HTTP::RequestInputAccess {
     RouteHandler rh;
+
     string kind;
 
     RequestInputAccess() {
-      exists (Expr request | request = rh.getARequestExpr() |
+      exists(Expr request | request = rh.getARequestExpr() |
         // `ctx.request.body`
         kind = "body" and
         this.asExpr().(PropAccess).accesses(request, "body")
@@ -170,40 +150,35 @@ module Koa {
         kind = "parameter" and
         this = getAQueryParameterAccess(rh)
         or
-        exists (string propName |
+        exists(string propName |
           // `ctx.request.url`, `ctx.request.originalUrl`, or `ctx.request.href`
           kind = "url" and
-          this.asExpr().(PropAccess).accesses(request, propName) |
+          this.asExpr().(PropAccess).accesses(request, propName)
+        |
           propName = "url" or
           propName = "originalUrl" or
           propName = "href"
         )
       )
       or
-      exists (PropAccess cookies |
+      exists(PropAccess cookies |
         // `ctx.cookies.get(<name>)`
         kind = "cookie" and
         cookies.accesses(rh.getAContextExpr(), "cookies") and
         this.asExpr().(MethodCallExpr).calls(cookies, "get")
       )
       or
-      exists (RequestHeaderAccess access | access = this |
+      exists(RequestHeaderAccess access | access = this |
         rh = access.getRouteHandler() and
-        kind = "header")
-    }
-
-    override RouteHandler getRouteHandler() {
-      result = rh
+        kind = "header"
+      )
     }
 
-    override string getKind() {
-      result = kind
-    }
+    override RouteHandler getRouteHandler() { result = rh }
 
-    override predicate isUserControlledObject() {
-      this = getAQueryParameterAccess(rh)
-    }
+    override string getKind() { result = kind }
 
+    override predicate isUserControlledObject() { this = getAQueryParameterAccess(rh) }
   }
 
   private DataFlow::Node getAQueryParameterAccess(RouteHandler rh) {
@@ -218,11 +193,12 @@ module Koa {
     RouteHandler rh;
 
     RequestHeaderAccess() {
-      exists (Expr request | request = rh.getARequestExpr() |
-        exists (string propName, PropAccess headers |
+      exists(Expr request | request = rh.getARequestExpr() |
+        exists(string propName, PropAccess headers |
           // `ctx.request.header.<name>`, `ctx.request.headers.<name>`
           headers.accesses(request, propName) and
-          this.asExpr().(PropAccess).accesses(headers, _) |
+          this.asExpr().(PropAccess).accesses(headers, _)
+        |
           propName = "header" or
           propName = "headers"
         )
@@ -235,18 +211,15 @@ module Koa {
     override string getAHeaderName() {
       result = this.(DataFlow::PropRead).getPropertyName().toLowerCase()
       or
-      exists (string name |
+      exists(string name |
         this.(DataFlow::CallNode).getArgument(0).mayHaveStringValue(name) and
-        result = name.toLowerCase())
+        result = name.toLowerCase()
+      )
     }
 
-    override RouteHandler getRouteHandler() {
-      result = rh
-    }
+    override RouteHandler getRouteHandler() { result = rh }
 
-    override string getKind() {
-      result = "header"
-    }
+    override string getKind() { result = "header" }
   }
 
   /**
@@ -261,13 +234,9 @@ module Koa {
       getMethodName() = "use"
     }
 
-    override DataFlow::SourceNode getARouteHandler() {
-      result.flowsToExpr(getArgument(0))
-    }
+    override DataFlow::SourceNode getARouteHandler() { result.flowsToExpr(getArgument(0)) }
 
-    override Expr getServer() {
-      result = server
-    }
+    override Expr getServer() { result = server }
   }
 
   /**
@@ -277,12 +246,11 @@ module Koa {
     RouteHandler rh;
 
     ResponseSendArgument() {
-      exists (DataFlow::PropWrite pwn |
+      exists(DataFlow::PropWrite pwn |
         pwn.writes(DataFlow::valueNode(rh.getAResponseExpr()), "body", DataFlow::valueNode(this))
       )
     }
 
     override RouteHandler getRouteHandler() { result = rh }
   }
-
 }
diff --git a/javascript/ql/src/semmle/javascript/frameworks/LodashUnderscore.qll b/javascript/ql/src/semmle/javascript/frameworks/LodashUnderscore.qll
index 1784e9ba56b3..7ab3e2f8d20b 100644
--- a/javascript/ql/src/semmle/javascript/frameworks/LodashUnderscore.qll
+++ b/javascript/ql/src/semmle/javascript/frameworks/LodashUnderscore.qll
@@ -1,6 +1,7 @@
 /**
  * Provides classes for working with [lodash](https://lodash.com/) and [underscore](http://underscorejs.org/).
  */
+
 import javascript
 
 /** Provides a unified model of [lodash](https://lodash.com/) and [underscore](http://underscorejs.org/). */
@@ -27,9 +28,7 @@ module LodashUnderscore {
       this = DataFlow::globalVarRef("_").getAPropertyRead(name)
     }
 
-    override string getName() {
-      result = name
-    }
+    override string getName() { result = name }
   }
 
   /**
@@ -38,9 +37,7 @@ module LodashUnderscore {
    * In addition to normal imports, this supports per-method imports such as `require("lodash.map")` and `require("lodash/map")`.
    * In addition, the global variable `_` is assumed to refer to `lodash` or `underscore`.
    */
-  DataFlow::SourceNode member(string name) {
-    result.(Member).getName() = name
-  }
+  DataFlow::SourceNode member(string name) { result.(Member).getName() = name }
 }
 
 /**
@@ -51,15 +48,18 @@ module LodashUnderscore {
  * still infer the ordinary abstract value.
  */
 private class AnalyzedThisInBoundCallback extends AnalyzedNode, DataFlow::ThisNode {
-
   AnalyzedNode thisSource;
 
   AnalyzedThisInBoundCallback() {
-    exists(DataFlow::CallNode bindingCall, string binderName, int callbackIndex, int contextIndex, int argumentCount |
+    exists(
+      DataFlow::CallNode bindingCall, string binderName, int callbackIndex, int contextIndex,
+      int argumentCount
+    |
       bindingCall = LodashUnderscore::member(binderName).getACall() and
       bindingCall.getNumArgument() = argumentCount and
       getBinder() = bindingCall.getCallback(callbackIndex) and
-      thisSource = bindingCall.getArgument(contextIndex) |
+      thisSource = bindingCall.getArgument(contextIndex)
+    |
       (
         (
           binderName = "bind" or
@@ -69,7 +69,8 @@ private class AnalyzedThisInBoundCallback extends AnalyzedNode, DataFlow::ThisNo
         callbackIndex = 0 and
         contextIndex = 1 and
         argumentCount = 2
-      ) or
+      )
+      or
       (
         (
           binderName = "all" or
@@ -120,7 +121,9 @@ private class AnalyzedThisInBoundCallback extends AnalyzedNode, DataFlow::ThisNo
         callbackIndex = 1 and
         contextIndex = 2 and
         argumentCount = 3
-      ) or (
+      )
+      or
+      (
         (
           binderName = "foldl" or
           binderName = "foldr" or
@@ -132,13 +135,20 @@ private class AnalyzedThisInBoundCallback extends AnalyzedNode, DataFlow::ThisNo
         callbackIndex = 1 and
         contextIndex = 3 and
         argumentCount = 4
-      ) or (
+      )
+      or
+      (
         (
-          binderName = "sortedlastIndex" or
-          binderName = "assign" or
-          binderName = "eq" or
-          binderName = "extend" or
-          binderName = "merge" or
+          binderName = "sortedlastIndex"
+          or
+          binderName = "assign"
+          or
+          binderName = "eq"
+          or
+          binderName = "extend"
+          or
+          binderName = "merge"
+          or
           binderName = "sortedIndex" and
           binderName = "uniq"
         ) and
@@ -153,5 +163,4 @@ private class AnalyzedThisInBoundCallback extends AnalyzedNode, DataFlow::ThisNo
     result = thisSource.getALocalValue() or
     result = AnalyzedNode.super.getALocalValue()
   }
-
 }
diff --git a/javascript/ql/src/semmle/javascript/frameworks/Logging.qll b/javascript/ql/src/semmle/javascript/frameworks/Logging.qll
index 1a1c702a7bcd..28e7b833c696 100644
--- a/javascript/ql/src/semmle/javascript/frameworks/Logging.qll
+++ b/javascript/ql/src/semmle/javascript/frameworks/Logging.qll
@@ -8,12 +8,10 @@ import javascript
  * A call to a logging mechanism.
  */
 abstract class LoggerCall extends DataFlow::CallNode {
-
   /**
    * Gets a node that contributes to the logged message.
    */
   abstract DataFlow::Node getAMessageComponent();
-
 }
 
 /**
@@ -37,7 +35,6 @@ private string getAStandardLoggerMethodName() {
  * Provides classes for working the builtin Node.js/Browser `console`.
  */
 private module Console {
-
   /**
    * Gets a data flow source node for the console library.
    */
@@ -51,7 +48,7 @@ private module Console {
    */
   class ConsoleLoggerCall extends LoggerCall {
     string name;
-    
+
     ConsoleLoggerCall() {
       (
         name = getAStandardLoggerMethodName() or
@@ -61,21 +58,17 @@ private module Console {
     }
 
     override DataFlow::Node getAMessageComponent() {
-      if name = "assert" then
-        result = getArgument([1..getNumArgument()])
-      else
-        result = getAnArgument()
+      if name = "assert"
+      then result = getArgument([1 .. getNumArgument()])
+      else result = getAnArgument()
     }
-
   }
-
 }
 
 /**
  * Provides classes for working with [loglevel](https://github.com/pimterry/loglevel).
  */
 private module Loglevel {
-
   /**
    * A call to the loglevel logging mechanism.
    */
@@ -84,56 +77,46 @@ private module Loglevel {
       this = DataFlow::moduleMember("loglevel", getAStandardLoggerMethodName()).getACall()
     }
 
-    override DataFlow::Node getAMessageComponent() {
-      result = getAnArgument()
-    }
-
+    override DataFlow::Node getAMessageComponent() { result = getAnArgument() }
   }
-
 }
 
-
 /**
  * Provides classes for working with [winston](https://github.com/winstonjs/winston).
  */
 private module Winston {
-
   /**
    * A call to the winston logging mechanism.
    */
   class WinstonLoggerCall extends LoggerCall, DataFlow::MethodCallNode {
     WinstonLoggerCall() {
-      this = DataFlow::moduleMember("winston", "createLogger").getACall().getAMethodCall(getAStandardLoggerMethodName())
+      this = DataFlow::moduleMember("winston", "createLogger")
+            .getACall()
+            .getAMethodCall(getAStandardLoggerMethodName())
     }
 
     override DataFlow::Node getAMessageComponent() {
-      if getMethodName() = "log" then
-        result = getOptionArgument(0, "message")
-      else
-        result = getAnArgument()
+      if getMethodName() = "log"
+      then result = getOptionArgument(0, "message")
+      else result = getAnArgument()
     }
-
   }
-
 }
 
 /**
  * Provides classes for working with [log4js](https://github.com/log4js-node/log4js-node).
  */
 private module log4js {
-
   /**
    * A call to the log4js logging mechanism.
    */
   class Log4jsLoggerCall extends LoggerCall {
     Log4jsLoggerCall() {
-      this = DataFlow::moduleMember("log4js", "getLogger").getACall().getAMethodCall(getAStandardLoggerMethodName())
-    }
-
-    override DataFlow::Node getAMessageComponent() {
-      result = getAnArgument()
+      this = DataFlow::moduleMember("log4js", "getLogger")
+            .getACall()
+            .getAMethodCall(getAStandardLoggerMethodName())
     }
 
+    override DataFlow::Node getAMessageComponent() { result = getAnArgument() }
   }
-
-}
\ No newline at end of file
+}
diff --git a/javascript/ql/src/semmle/javascript/frameworks/NoSQL.qll b/javascript/ql/src/semmle/javascript/frameworks/NoSQL.qll
index cbea55340dda..ee919f008179 100644
--- a/javascript/ql/src/semmle/javascript/frameworks/NoSQL.qll
+++ b/javascript/ql/src/semmle/javascript/frameworks/NoSQL.qll
@@ -6,8 +6,7 @@ import javascript
 
 module NoSQL {
   /** An expression that is interpreted as a NoSQL query. */
-  abstract class Query extends Expr {
-  }
+  abstract class Query extends Expr { }
 }
 
 /**
@@ -17,16 +16,12 @@ private module MongoDB {
   /**
    * Gets an import of MongoDB.
    */
-  DataFlow::ModuleImportNode mongodb() {
-    result.getPath() = "mongodb"
-  }
+  DataFlow::ModuleImportNode mongodb() { result.getPath() = "mongodb" }
 
   /**
    * Gets an access to `mongodb.MongoClient`.
    */
-  DataFlow::SourceNode getAMongoClient() {
-    result = mongodb().getAPropertyRead("MongoClient")
-  }
+  DataFlow::SourceNode getAMongoClient() { result = mongodb().getAPropertyRead("MongoClient") }
 
   /**
    * Gets an expression that may refer to a MongoDB database connection.
@@ -38,16 +33,16 @@ private module MongoDB {
   /**
    * An expression that may hold a MongoDB collection.
    */
-  abstract class Collection extends Expr {
-  }
+  abstract class Collection extends Expr { }
 
   /**
    * A collection resulting from calling `Db.collection(...)`.
    */
   private class CollectionFromDb extends Collection {
     CollectionFromDb() {
-      exists (DataFlow::CallNode collection |
-        collection = getAMongoDb().getAMethodCall("collection") |
+      exists(DataFlow::CallNode collection |
+        collection = getAMongoDb().getAMethodCall("collection")
+      |
         collection.flowsToExpr(this)
         or
         collection.getCallback(1).getParameter(0).flowsToExpr(this)
@@ -58,25 +53,41 @@ private module MongoDB {
   /** A call to a MongoDB query method. */
   private class QueryCall extends DatabaseAccess, DataFlow::ValueNode {
     override MethodCallExpr astNode;
+
     int queryArgIdx;
 
     QueryCall() {
-      exists (string m | asExpr().(MethodCallExpr).calls(any(Collection c), m) |
-        m = "aggregate" and queryArgIdx = 0 or
-        m = "count" and queryArgIdx = 0 or
-        m = "deleteMany" and queryArgIdx = 0 or
-        m = "deleteOne" and queryArgIdx = 0 or
-        m = "distinct" and queryArgIdx = 1 or
-        m = "find" and queryArgIdx = 0 or
-        m = "findOne" and queryArgIdx = 0 or
-        m = "findOneAndDelete" and queryArgIdx = 0 or
-        m = "findOneAndRemove" and queryArgIdx = 0 or
-        m = "findOneAndDelete" and queryArgIdx = 0 or
-        m = "findOneAndUpdate" and queryArgIdx = 0 or
-        m = "remove" and queryArgIdx = 0 or
-        m = "replaceOne" and queryArgIdx = 0 or
-        m = "update" and queryArgIdx = 0 or
-        m = "updateMany" and queryArgIdx = 0 or
+      exists(string m | asExpr().(MethodCallExpr).calls(any(Collection c), m) |
+        m = "aggregate" and queryArgIdx = 0
+        or
+        m = "count" and queryArgIdx = 0
+        or
+        m = "deleteMany" and queryArgIdx = 0
+        or
+        m = "deleteOne" and queryArgIdx = 0
+        or
+        m = "distinct" and queryArgIdx = 1
+        or
+        m = "find" and queryArgIdx = 0
+        or
+        m = "findOne" and queryArgIdx = 0
+        or
+        m = "findOneAndDelete" and queryArgIdx = 0
+        or
+        m = "findOneAndRemove" and queryArgIdx = 0
+        or
+        m = "findOneAndDelete" and queryArgIdx = 0
+        or
+        m = "findOneAndUpdate" and queryArgIdx = 0
+        or
+        m = "remove" and queryArgIdx = 0
+        or
+        m = "replaceOne" and queryArgIdx = 0
+        or
+        m = "update" and queryArgIdx = 0
+        or
+        m = "updateMany" and queryArgIdx = 0
+        or
         m = "updateOne" and queryArgIdx = 0
       )
     }
@@ -90,9 +101,7 @@ private module MongoDB {
    * An expression that is interpreted as a MongoDB query.
    */
   class Query extends NoSQL::Query {
-    Query() {
-      this = any(QueryCall qc).getAQueryArgument().asExpr()
-    }
+    Query() { this = any(QueryCall qc).getAQueryArgument().asExpr() }
   }
 }
 
@@ -103,9 +112,7 @@ private module Mongoose {
   /**
    * Gets an import of Mongoose.
    */
-  DataFlow::ModuleImportNode getAMongooseInstance() {
-    result.getPath() = "mongoose"
-  }
+  DataFlow::ModuleImportNode getAMongooseInstance() { result.getPath() = "mongoose" }
 
   /**
    * Gets a call to `mongoose.createConnection`.
@@ -118,9 +125,7 @@ private module Mongoose {
    * A Mongoose collection object.
    */
   class Model extends MongoDB::Collection {
-    Model() {
-      getAMongooseInstance().getAMemberCall("model").flowsToExpr(this)
-    }
+    Model() { getAMongooseInstance().getAMemberCall("model").flowsToExpr(this) }
   }
 
   /**
@@ -130,16 +135,13 @@ private module Mongoose {
     string kind;
 
     Credentials() {
-      exists (string prop |
-        createConnection().hasOptionArgument(3, prop, this) |
+      exists(string prop | createConnection().hasOptionArgument(3, prop, this) |
         prop = "user" and kind = "user name"
         or
         prop = "pass" and kind = "password"
       )
     }
 
-    override string getCredentialsKind() {
-      result = kind
-    }
+    override string getCredentialsKind() { result = kind }
   }
 }
diff --git a/javascript/ql/src/semmle/javascript/frameworks/NodeJSLib.qll b/javascript/ql/src/semmle/javascript/frameworks/NodeJSLib.qll
index 19252cb7de1c..581659a89740 100644
--- a/javascript/ql/src/semmle/javascript/frameworks/NodeJSLib.qll
+++ b/javascript/ql/src/semmle/javascript/frameworks/NodeJSLib.qll
@@ -7,7 +7,6 @@ import semmle.javascript.frameworks.HTTP
 import semmle.javascript.security.SensitiveActions
 
 module NodeJSLib {
-
   /**
    * Gets a reference to the 'process' object.
    */
@@ -37,8 +36,7 @@ module NodeJSLib {
    * A server library that provides an (enhanced) NodesJS HTTP response
    * object should implement a library specific subclass of this class.
    */
-  abstract class ResponseExpr extends HTTP::Servers::StandardResponseExpr {
-  }
+  abstract class ResponseExpr extends HTTP::Servers::StandardResponseExpr { }
 
   /**
    * A Node.js HTTP request.
@@ -46,8 +44,7 @@ module NodeJSLib {
    * A server library that provides an (enhanced) NodesJS HTTP request
    * object should implement a library specific subclass of this class.
    */
-  abstract class RequestExpr extends HTTP::Servers::StandardRequestExpr {
-  }
+  abstract class RequestExpr extends HTTP::Servers::StandardRequestExpr { }
 
   /**
    * A function used as an Node.js server route handler.
@@ -57,29 +54,22 @@ module NodeJSLib {
    * additional subclasses of this class.
    */
   abstract class RouteHandler extends HTTP::Servers::StandardRouteHandler, DataFlow::FunctionNode {
-
     /**
      * Gets the parameter of the route handler that contains the request object.
      */
-    SimpleParameter getRequestParameter() {
-      result = getFunction().getParameter(0)
-    }
+    SimpleParameter getRequestParameter() { result = getFunction().getParameter(0) }
 
     /**
      * Gets the parameter of the route handler that contains the response object.
      */
-    SimpleParameter getResponseParameter() {
-      result = getFunction().getParameter(1)
-    }
+    SimpleParameter getResponseParameter() { result = getFunction().getParameter(1) }
   }
 
   /**
    * A route handler installed by a route setup.
    */
   class StandardRouteHandler extends RouteHandler {
-    StandardRouteHandler() {
-      this = any(RouteSetup setup).getARouteHandler()
-    }
+    StandardRouteHandler() { this = any(RouteSetup setup).getARouteHandler() }
   }
 
   /**
@@ -89,16 +79,12 @@ module NodeJSLib {
   private class ResponseSource extends HTTP::Servers::ResponseSource {
     RouteHandler rh;
 
-    ResponseSource() {
-      this = DataFlow::parameterNode(rh.getResponseParameter())
-    }
+    ResponseSource() { this = DataFlow::parameterNode(rh.getResponseParameter()) }
 
     /**
      * Gets the route handler that provides this response.
      */
-    override RouteHandler getRouteHandler() {
-      result = rh
-    }
+    override RouteHandler getRouteHandler() { result = rh }
   }
 
   /**
@@ -108,16 +94,12 @@ module NodeJSLib {
   private class RequestSource extends HTTP::Servers::RequestSource {
     RouteHandler rh;
 
-    RequestSource() {
-      this = DataFlow::parameterNode(rh.getRequestParameter())
-    }
+    RequestSource() { this = DataFlow::parameterNode(rh.getRequestParameter()) }
 
     /**
      * Gets the route handler that handles this request.
      */
-    override RouteHandler getRouteHandler() {
-      result = rh
-    }
+    override RouteHandler getRouteHandler() { result = rh }
   }
 
   /**
@@ -139,6 +121,7 @@ module NodeJSLib {
    */
   private class RequestInputAccess extends HTTP::RequestInputAccess {
     RequestExpr request;
+
     string kind;
 
     RequestInputAccess() {
@@ -146,25 +129,22 @@ module NodeJSLib {
       kind = "url" and
       this.asExpr().(PropAccess).accesses(request, "url")
       or
-      exists (PropAccess headers |
+      exists(PropAccess headers |
         // `req.headers.cookie`
         kind = "cookie" and
         headers.accesses(request, "headers") and
         this.asExpr().(PropAccess).accesses(headers, "cookie")
       )
       or
-      exists (RequestHeaderAccess access | this = access |
+      exists(RequestHeaderAccess access | this = access |
         request = access.getRequest() and
-        kind = "header")
+        kind = "header"
+      )
     }
 
-    override RouteHandler getRouteHandler() {
-      result = request.getRouteHandler()
-    }
+    override RouteHandler getRouteHandler() { result = request.getRouteHandler() }
 
-    override string getKind() {
-      result = kind
-    }
+    override string getKind() { result = kind }
   }
 
   /**
@@ -174,7 +154,7 @@ module NodeJSLib {
     RequestExpr request;
 
     RequestHeaderAccess() {
-      exists (PropAccess headers, string name |
+      exists(PropAccess headers, string name |
         // `req.headers.<name>`
         name != "cookie" and
         headers.accesses(request, "headers") and
@@ -186,21 +166,16 @@ module NodeJSLib {
       result = this.(DataFlow::PropRead).getPropertyName().toLowerCase()
     }
 
-    override RouteHandler getRouteHandler() {
-      result = request.getRouteHandler()
-    }
+    override RouteHandler getRouteHandler() { result = request.getRouteHandler() }
 
-    override string getKind() {
-      result = "header"
-    }
+    override string getKind() { result = "header" }
 
-    RequestExpr getRequest() {
-      result = request
-    }
+    RequestExpr getRequest() { result = request }
   }
 
   class RouteSetup extends CallExpr, HTTP::Servers::StandardRouteSetup {
     ServerDefinition server;
+
     Expr handler;
 
     RouteSetup() {
@@ -218,40 +193,27 @@ module NodeJSLib {
       result.(DataFlow::TrackedNode).flowsTo(handler.flow())
     }
 
-    override Expr getServer() {
-      result = server
-    }
+    override Expr getServer() { result = server }
 
     /**
      * Gets the expression for the handler registered by this setup.
      */
-    Expr getRouteHandlerExpr() {
-      result = handler
-    }
-
+    Expr getRouteHandlerExpr() { result = handler }
   }
 
-  private abstract class HeaderDefinition extends HTTP::Servers::StandardHeaderDefinition {
-
+  abstract private class HeaderDefinition extends HTTP::Servers::StandardHeaderDefinition {
     ResponseExpr r;
 
-    HeaderDefinition(){
-      astNode.getReceiver() = r
-    }
-
-    override HTTP::RouteHandler getRouteHandler(){
-      result = r.getRouteHandler()
-    }
+    HeaderDefinition() { astNode.getReceiver() = r }
 
+    override HTTP::RouteHandler getRouteHandler() { result = r.getRouteHandler() }
   }
 
   /**
    * A call to the `setHeader` method of an HTTP response.
    */
   private class SetHeader extends HeaderDefinition {
-    SetHeader() {
-      astNode.getMethodName() = "setHeader"
-    }
+    SetHeader() { astNode.getMethodName() = "setHeader" }
   }
 
   /**
@@ -264,7 +226,7 @@ module NodeJSLib {
     }
 
     override predicate definesExplicitly(string headerName, Expr headerValue) {
-      exists (DataFlow::SourceNode headers, string header |
+      exists(DataFlow::SourceNode headers, string header |
         headers.flowsToExpr(astNode.getLastArgument()) and
         headers.hasPropertyWrite(header, DataFlow::valueNode(headerValue)) and
         headerName = header.toLowerCase()
@@ -279,17 +241,23 @@ module NodeJSLib {
     DataFlow::Node tainted;
 
     PathFlowTarget() {
-      exists (string methodName | this = DataFlow::moduleMember("path", methodName).getACall() |
+      exists(string methodName | this = DataFlow::moduleMember("path", methodName).getACall() |
         // getters
-        (methodName = "basename" and tainted = getArgument(0)) or
-        (methodName = "dirname" and tainted = getArgument(0)) or
-        (methodName = "extname" and tainted = getArgument(0)) or
-
+        (methodName = "basename" and tainted = getArgument(0))
+        or
+        (methodName = "dirname" and tainted = getArgument(0))
+        or
+        (methodName = "extname" and tainted = getArgument(0))
+        or
         // transformers
-        (methodName = "join" and tainted = getAnArgument()) or
-        (methodName = "normalize" and tainted = getArgument(0)) or
-        (methodName = "relative" and tainted = getArgument([0..1])) or
-        (methodName = "resolve" and tainted = getAnArgument()) or
+        (methodName = "join" and tainted = getAnArgument())
+        or
+        (methodName = "normalize" and tainted = getArgument(0))
+        or
+        (methodName = "relative" and tainted = getArgument([0 .. 1]))
+        or
+        (methodName = "resolve" and tainted = getAnArgument())
+        or
         (methodName = "toNamespacedPath" and tainted = getArgument(0))
       )
     }
@@ -323,7 +291,7 @@ module NodeJSLib {
     HTTP::RouteHandler rh;
 
     ResponseSendArgument() {
-      exists (MethodCallExpr mce, string m | m = "write" or m = "end" |
+      exists(MethodCallExpr mce, string m | m = "write" or m = "end" |
         mce.calls(any(ResponseExpr e | e.getRouteHandler() = rh), m) and
         this = mce.getArgument(0) and
         // don't mistake callback functions as data
@@ -338,22 +306,19 @@ module NodeJSLib {
    * An expression that creates a new Node.js server.
    */
   class ServerDefinition extends HTTP::Servers::StandardServerDefinition {
-    ServerDefinition() {
-      isCreateServer(this)
-    }
+    ServerDefinition() { isCreateServer(this) }
   }
 
   /** An expression that is passed as `http.request({ auth: <expr> }, ...)`. */
   class Credentials extends CredentialsExpr {
-
     Credentials() {
-      this = DataFlow::moduleMember(HTTP::httpOrHttps(), "request").getACall().getOptionArgument(0, "auth").asExpr()
-    }
-
-    override string getCredentialsKind() {
-      result = "credentials"
+      this = DataFlow::moduleMember(HTTP::httpOrHttps(), "request")
+            .getACall()
+            .getOptionArgument(0, "auth")
+            .asExpr()
     }
 
+    override string getCredentialsKind() { result = "credentials" }
   }
 
   /**
@@ -367,7 +332,6 @@ module NodeJSLib {
       or
       this = processMember("exit").getACall()
     }
-
   }
 
   /**
@@ -379,17 +343,19 @@ module NodeJSLib {
    * `path` or a variation thereof.
    */
   private predicate fsFileParam(string methodName, int i) {
-    exists (ExternalMemberDecl decl, Function f, JSDocParamTag p, string n |
-      decl.hasQualifiedName("fs", methodName) and f = decl.getInit() and
+    exists(ExternalMemberDecl decl, Function f, JSDocParamTag p, string n |
+      decl.hasQualifiedName("fs", methodName) and
+      f = decl.getInit() and
       p.getDocumentedParameter() = f.getParameter(i).getAVariable() and
-      n = p.getName().toLowerCase() |
+      n = p.getName().toLowerCase()
+    |
       n = "filename" or n.regexpMatch("(old|new|src|dst|)path")
     )
   }
 
   /**
    * Holds if the `i`th parameter of method `methodName` of the Node.js
-   * `fs` module might represent a data parameter or buffer or a callback 
+   * `fs` module might represent a data parameter or buffer or a callback
    * that receives the data.
    *
    * We determine this by looking for an externs declaration for
@@ -397,21 +363,25 @@ module NodeJSLib {
    * `buffer` or a `callback`.
    */
   private predicate fsDataParam(string methodName, int i, string n) {
-    exists (ExternalMemberDecl decl, Function f, JSDocParamTag p |
-      decl.hasQualifiedName("fs", methodName) and f = decl.getInit() and
+    exists(ExternalMemberDecl decl, Function f, JSDocParamTag p |
+      decl.hasQualifiedName("fs", methodName) and
+      f = decl.getInit() and
       p.getDocumentedParameter() = f.getParameter(i).getAVariable() and
-      n = p.getName().toLowerCase() |
+      n = p.getName().toLowerCase()
+    |
       n = "data" or n = "buffer" or n = "callback"
     )
   }
+
   /**
    * A member `member` from module `fs` or its drop-in replacements `graceful-fs` or `fs-extra`.
    */
   private DataFlow::SourceNode fsModuleMember(string member) {
-    exists (string moduleName |
+    exists(string moduleName |
       moduleName = "fs" or
       moduleName = "graceful-fs" or
-      moduleName = "fs-extra" |
+      moduleName = "fs-extra"
+    |
       result = DataFlow::moduleMember(moduleName, member)
     )
   }
@@ -422,26 +392,21 @@ module NodeJSLib {
   private class NodeJSFileSystemAccess extends FileSystemAccess, DataFlow::CallNode {
     string methodName;
 
-    NodeJSFileSystemAccess() {
-      this = fsModuleMember(methodName).getACall()
-    }
+    NodeJSFileSystemAccess() { this = fsModuleMember(methodName).getACall() }
 
     /**
      * Gets the name of the called method.
      */
-    string getMethodName() {
-        result = methodName
-    }
+    string getMethodName() { result = methodName }
 
     override DataFlow::Node getAPathArgument() {
-      exists (int i | fsFileParam(methodName, i) | 
-        result = getArgument(i))
+      exists(int i | fsFileParam(methodName, i) | result = getArgument(i))
     }
   }
 
   /** A write to the file system. */
   private class NodeJSFileSystemAccessWrite extends FileSystemWriteAccess, NodeJSFileSystemAccess {
-    NodeJSFileSystemAccessWrite () {
+    NodeJSFileSystemAccessWrite() {
       methodName = "appendFile" or
       methodName = "appendFileSync" or
       methodName = "write" or
@@ -451,24 +416,22 @@ module NodeJSLib {
     }
 
     override DataFlow::Node getADataNode() {
-      exists (int i, string paramName |
-        fsDataParam(methodName, i, paramName) |
-        if paramName = "callback" then
-          exists (DataFlow::ParameterNode p |
+      exists(int i, string paramName | fsDataParam(methodName, i, paramName) |
+        if paramName = "callback"
+        then
+          exists(DataFlow::ParameterNode p |
             p = getCallback(i).getAParameter() and
             p.getName().regexpMatch("(?i)data|buffer|string") and
             result = p
           )
-        else
-          result = getArgument(i)
+        else result = getArgument(i)
       )
     }
-
   }
 
   /** A file system read. */
   private class NodeJSFileSystemAccessRead extends FileSystemReadAccess, NodeJSFileSystemAccess {
-    NodeJSFileSystemAccessRead () {
+    NodeJSFileSystemAccessRead() {
       methodName = "read" or
       methodName = "readSync" or
       methodName = "readFile" or
@@ -476,54 +439,47 @@ module NodeJSLib {
     }
 
     override DataFlow::Node getADataNode() {
-      if methodName.regexpMatch(".*Sync") then
-        result = this
+      if methodName.regexpMatch(".*Sync")
+      then result = this
       else
-        exists (int i, string paramName |
-          fsDataParam(methodName, i, paramName) |
-          if paramName = "callback" then
-            exists (DataFlow::ParameterNode p |
+        exists(int i, string paramName | fsDataParam(methodName, i, paramName) |
+          if paramName = "callback"
+          then
+            exists(DataFlow::ParameterNode p |
               p = getCallback(i).getAParameter() and
               p.getName().regexpMatch("(?i)data|buffer|string") and
               result = p
             )
-          else
-            result = getArgument(i)
+          else result = getArgument(i)
         )
     }
-
   }
-  
+
   /**
    * A write to the file system, using a stream.
    */
   private class FileStreamWrite extends FileSystemWriteAccess, DataFlow::CallNode {
-
     NodeJSFileSystemAccess stream;
 
     FileStreamWrite() {
       stream.getMethodName() = "createWriteStream" and
-      exists (string method |
+      exists(string method |
         method = "write" or
-        method = "end" |
+        method = "end"
+      |
         this = stream.getAMemberCall(method)
       )
     }
 
-    override DataFlow::Node getADataNode() {
-      result = getArgument(0)
-    }
+    override DataFlow::Node getADataNode() { result = getArgument(0) }
 
-    override DataFlow::Node getAPathArgument() {
-      result = stream.getAPathArgument()
-    }
+    override DataFlow::Node getAPathArgument() { result = stream.getAPathArgument() }
   }
 
   /**
    * A read from the file system using a stream.
    */
   private class FileStreamRead extends FileSystemReadAccess, DataFlow::CallNode {
-
     NodeJSFileSystemAccess stream;
 
     string method;
@@ -546,25 +502,22 @@ module NodeJSLib {
       result = getCallback(1).getParameter(0)
     }
 
-    override DataFlow::Node getAPathArgument() {
-      result = stream.getAPathArgument()
-    }
+    override DataFlow::Node getAPathArgument() { result = stream.getAPathArgument() }
   }
 
   /**
    * A data flow node that contains a file name or an array of file names from the local file system.
    */
   private class NodeJSFileNameSource extends FileNameSource {
-
     NodeJSFileNameSource() {
-      exists (string name |
+      exists(string name |
         name = "readdir" or
-        name = "realpath" |
-        this = fsModuleMember(name).getACall().getCallback([1..2]).getParameter(1) or
+        name = "realpath"
+      |
+        this = fsModuleMember(name).getACall().getCallback([1 .. 2]).getParameter(1) or
         this = fsModuleMember(name + "Sync").getACall()
       )
     }
-
   }
 
   /**
@@ -587,21 +540,19 @@ module NodeJSLib {
         methodName = "spawn" or
         methodName = "spawnSync" or
         methodName = "fork"
-      )
-      and
+      ) and
       // all of the above methods take the command as their first argument
       result = getArgument(0)
     }
 
     override DataFlow::Node getArgumentList() {
       (
-       methodName = "execFile" or
-       methodName = "execFileSync" or
-       methodName = "fork" or
-       methodName = "spawn" or
-       methodName = "spawnSync"
-      )
-      and
+        methodName = "execFile" or
+        methodName = "execFileSync" or
+        methodName = "fork" or
+        methodName = "spawn" or
+        methodName = "spawnSync"
+      ) and
       // all of the above methods take the argument list as their second argument
       result = getArgument(1)
     }
@@ -613,20 +564,22 @@ module NodeJSLib {
    * For example, this could be the function `function(req, res){...}`.
    */
   class RouteHandlerCandidate extends HTTP::RouteHandlerCandidate {
-
     RouteHandlerCandidate() {
-      exists (string request, string response |
+      exists(string request, string response |
         (request = "request" or request = "req") and
         (response = "response" or response = "res") and
         // heuristic: parameter names match the Node.js documentation
         astNode.getNumParameter() = 2 and
         astNode.getParameter(0).getName() = request and
-        astNode.getParameter(1).getName() = response |
+        astNode.getParameter(1).getName() = response
+      |
         not (
           // heuristic: not a class method (Node.js invokes this with a function call)
-          astNode = any(MethodDefinition def).getBody() or
+          astNode = any(MethodDefinition def).getBody()
+          or
           // heuristic: does not return anything (Node.js will not use the return value)
-          exists(astNode.getAReturnStmt().getExpr()) or
+          exists(astNode.getAReturnStmt().getExpr())
+          or
           // heuristic: is not invoked (Node.js invokes this at a call site we cannot reason precisely about)
           exists(DataFlow::InvokeNode cs | cs.getACallee() = astNode)
         )
@@ -638,18 +591,14 @@ module NodeJSLib {
    * Tracking for `RouteHandlerCandidate`.
    */
   private class TrackedRouteHandlerCandidate extends DataFlow::TrackedNode {
-
-    TrackedRouteHandlerCandidate() {
-      this instanceof RouteHandlerCandidate
-    }
-
+    TrackedRouteHandlerCandidate() { this instanceof RouteHandlerCandidate }
   }
 
   /**
    * A function that looks like a Node.js route handler and flows to a route setup.
    */
-  private class TrackedRouteHandlerCandidateWithSetup extends RouteHandler, HTTP::Servers::StandardRouteHandler, DataFlow::ValueNode {
-
+  private class TrackedRouteHandlerCandidateWithSetup extends RouteHandler,
+    HTTP::Servers::StandardRouteHandler, DataFlow::ValueNode {
     override Function astNode;
 
     TrackedRouteHandlerCandidateWithSetup() {
@@ -658,7 +607,6 @@ module NodeJSLib {
         this = tracked
       )
     }
-
   }
 
   /**
@@ -667,9 +615,7 @@ module NodeJSLib {
   class VmModuleMethodCall extends DataFlow::CallNode {
     string methodName;
 
-    VmModuleMethodCall() {
-      this = DataFlow::moduleMember("vm", methodName).getACall()
-    }
+    VmModuleMethodCall() { this = DataFlow::moduleMember("vm", methodName).getACall() }
 
     /**
      * Gets the code to be executed as part of this call.
@@ -679,8 +625,7 @@ module NodeJSLib {
         methodName = "runInContext" or
         methodName = "runInNewContext" or
         methodName = "runInThisContext"
-      )
-      and
+      ) and
       // all of the above methods take the command as their first argument
       result = getArgument(0)
     }
@@ -693,7 +638,6 @@ module NodeJSLib {
    * where it is unknown if `server` is a Node.js server.
    */
   class RouteSetupCandidate extends HTTP::RouteSetupCandidate, DataFlow::MethodCallNode {
-
     DataFlow::ValueNode arg;
 
     RouteSetupCandidate() {
@@ -705,39 +649,29 @@ module NodeJSLib {
       arg = getArgument(1)
     }
 
-    override DataFlow::ValueNode getARouteHandlerArg() {
-      result = arg
-    }
+    override DataFlow::ValueNode getARouteHandlerArg() { result = arg }
   }
 
   /**
    * A data flow node that is an HTTP or HTTPS client request made by a Node.js application, for example `http.request(url)`.
    */
-  abstract class CustomNodeJSClientRequest extends CustomClientRequest {
-
-  }
+  abstract class CustomNodeJSClientRequest extends CustomClientRequest { }
 
   /**
    * A data flow node that is an HTTP or HTTPS client request made by a Node.js application, for example `http.request(url)`.
    */
   class NodeJSClientRequest extends ClientRequest {
-
-    NodeJSClientRequest() {
-      this instanceof CustomNodeJSClientRequest
-    }
-
+    NodeJSClientRequest() { this instanceof CustomNodeJSClientRequest }
   }
 
   /**
    * A model of a URL request in the Node.js `http` library.
    */
   private class NodeHttpUrlRequest extends CustomNodeJSClientRequest {
-
     DataFlow::Node url;
 
     NodeHttpUrlRequest() {
-      exists (string moduleName, DataFlow::SourceNode callee |
-        this = callee.getACall() |
+      exists(string moduleName, DataFlow::SourceNode callee | this = callee.getACall() |
         (moduleName = "http" or moduleName = "https") and
         (
           callee = DataFlow::moduleMember(moduleName, any(HTTP::RequestMethodName m).toLowerCase())
@@ -748,25 +682,22 @@ module NodeJSLib {
       )
     }
 
-    override DataFlow::Node getUrl() {
-      result = url
-    }
+    override DataFlow::Node getUrl() { result = url }
 
     override DataFlow::Node getHost() {
-      exists (string name |
+      exists(string name |
         name = "host" or
-        name = "hostname" |
+        name = "hostname"
+      |
         result = getOptionArgument(1, name)
       )
     }
 
     override DataFlow::Node getADataNode() {
-      exists (string name |
-        name = "write" or name = "end" |
-        result =this.(DataFlow::SourceNode).getAMethodCall(name).getArgument(0)
+      exists(string name | name = "write" or name = "end" |
+        result = this.(DataFlow::SourceNode).getAMethodCall(name).getArgument(0)
       )
     }
-
   }
 
   /**
@@ -779,9 +710,7 @@ module NodeJSLib {
       )
     }
 
-    override string getSourceType() {
-      result = "NodeJSClientRequest callback parameter"
-    }
+    override string getSourceType() { result = "NodeJSClientRequest callback parameter" }
   }
 
   /**
@@ -796,16 +725,15 @@ module NodeJSLib {
       )
     }
 
-    override string getSourceType() {
-      result = "http.request data parameter"
-    }
+    override string getSourceType() { result = "http.request data parameter" }
   }
 
- /**
+  /**
    * A data flow node that is registered as a callback for an HTTP or HTTPS request made by a Node.js process, for example the function `handler` in `http.request(url).on(message, handler)`.
    */
   class ClientRequestHandler extends DataFlow::FunctionNode {
     string handledEvent;
+
     NodeJSClientRequest clientRequest;
 
     ClientRequestHandler() {
@@ -819,16 +747,12 @@ module NodeJSLib {
     /**
      * Gets the name of an event this callback is registered for.
      */
-    string getAHandledEvent() {
-      result = handledEvent
-    }
+    string getAHandledEvent() { result = handledEvent }
 
     /**
      * Gets a request this callback is registered for.
      */
-    NodeJSClientRequest getClientRequest() {
-      result = clientRequest
-    }
+    NodeJSClientRequest getClientRequest() { result = clientRequest }
   }
 
   /**
@@ -842,9 +766,7 @@ module NodeJSLib {
       )
     }
 
-    override string getSourceType() {
-      result = "NodeJSClientRequest response event"
-    }
+    override string getSourceType() { result = "NodeJSClientRequest response event" }
   }
 
   /**
@@ -859,18 +781,14 @@ module NodeJSLib {
       )
     }
 
-    override string getSourceType() {
-      result = "NodeJSClientRequest data event"
-    }
+    override string getSourceType() { result = "NodeJSClientRequest data event" }
   }
 
   /**
    * A data flow node that is a login callback for an HTTP or HTTPS request made by a Node.js process.
    */
   private class ClientRequestLoginHandler extends ClientRequestHandler {
-    ClientRequestLoginHandler() {
-      getAHandledEvent() = "login"
-    }
+    ClientRequestLoginHandler() { getAHandledEvent() = "login" }
   }
 
   /**
@@ -878,14 +796,10 @@ module NodeJSLib {
    */
   private class ClientRequestLoginEvent extends RemoteFlowSource {
     ClientRequestLoginEvent() {
-      exists(ClientRequestLoginHandler handler |
-        this = handler.getParameter(0)
-      )
+      exists(ClientRequestLoginHandler handler | this = handler.getParameter(0))
     }
 
-    override string getSourceType() {
-      result = "NodeJSClientRequest login event"
-    }
+    override string getSourceType() { result = "NodeJSClientRequest login event" }
   }
 
   /**
@@ -893,9 +807,7 @@ module NodeJSLib {
    */
   class ClientRequestLoginCallback extends DataFlow::ParameterNode {
     ClientRequestLoginCallback() {
-      exists(ClientRequestLoginHandler handler |
-        this = handler.getParameter(1)
-      )
+      exists(ClientRequestLoginHandler handler | this = handler.getParameter(1))
     }
   }
 
@@ -909,9 +821,7 @@ module NodeJSLib {
       )
     }
 
-    override string getCredentialsKind() {
-      result = "Node.js http(s) client login username"
-    }
+    override string getCredentialsKind() { result = "Node.js http(s) client login username" }
   }
 
   /**
@@ -924,12 +834,9 @@ module NodeJSLib {
       )
     }
 
-    override string getCredentialsKind() {
-      result = "Node.js http(s) client login password"
-    }
+    override string getCredentialsKind() { result = "Node.js http(s) client login password" }
   }
 
-
   /**
    * A data flow node that is the parameter of an error callback for an HTTP or HTTPS request made by a Node.js process, for example `err` in `http.request(url).on('error', (err) => {})`.
    */
@@ -941,8 +848,6 @@ module NodeJSLib {
       )
     }
 
-    override string getSourceType() {
-      result = "NodeJSClientRequest error event"
-    }
+    override string getSourceType() { result = "NodeJSClientRequest error event" }
   }
 }
diff --git a/javascript/ql/src/semmle/javascript/frameworks/PkgCloud.qll b/javascript/ql/src/semmle/javascript/frameworks/PkgCloud.qll
index 228b296935b2..02e565aed2e0 100644
--- a/javascript/ql/src/semmle/javascript/frameworks/PkgCloud.qll
+++ b/javascript/ql/src/semmle/javascript/frameworks/PkgCloud.qll
@@ -1,17 +1,16 @@
 /**
  * Provides classes for working with [pkgcloud](https://github.com/pkgcloud/pkgcloud) applications.
  */
+
 import javascript
 
 module PkgCloud {
-
   /**
    * Holds if the `i`th argument of `invk` is an object hash for pkgcloud client creation.
    */
   private predicate takesConfigurationObject(DataFlow::InvokeNode invk, int i) {
-    exists (DataFlow::ModuleImportNode mod, DataFlow::SourceNode receiver, string type |
-      mod.getPath() = "pkgcloud"
-      and
+    exists(DataFlow::ModuleImportNode mod, DataFlow::SourceNode receiver, string type |
+      mod.getPath() = "pkgcloud" and
       (
         type = "compute" or
         type = "storage" or
@@ -22,15 +21,14 @@ module PkgCloud {
         type = "network" or
         type = "orchestration" or
         type = "cdn"
-      )
-      and
+      ) and
       (
         // require('pkgcloud').compute
-        receiver = mod.getAPropertyRead(type) or
+        receiver = mod.getAPropertyRead(type)
+        or
         // require('pkgcloud').providers.joyent.compute
         receiver = mod.getAPropertyRead("providers").getAPropertyRead(_).getAPropertyRead(type)
-      )
-      and
+      ) and
       invk = receiver.getAMemberCall("createClient") and
       i = 0
     )
@@ -40,13 +38,13 @@ module PkgCloud {
    * An expression that is used for authentication through pkgcloud.
    */
   class Credentials extends CredentialsExpr {
-
     string kind;
 
     Credentials() {
-      exists (string propertyName, DataFlow::InvokeNode invk, int i |
+      exists(string propertyName, DataFlow::InvokeNode invk, int i |
         takesConfigurationObject(invk, i) and
-        this = invk.getOptionArgument(0, propertyName).asExpr() |
+        this = invk.getOptionArgument(0, propertyName).asExpr()
+      |
         /*
          * Catch-all support for the following providers:
          * - Amazon
@@ -61,27 +59,34 @@ module PkgCloud {
          * - MongoHQ
          * - RedisToGo
          */
-        (kind = "user name" and (
-          propertyName = "account" or
-          propertyName = "keyId" or
-          propertyName = "storageAccount" or
-          propertyName = "username"
-        )) or
-        (kind = "password" and (
-          propertyName = "key" or
-          propertyName = "apiKey" or
-          propertyName = "storageAccessKey" or
-          propertyName = "password"
-        )) or
-        (kind = "token" and (
-          propertyName = "token"
-        ))
-      )
-    }
 
-    override string getCredentialsKind() {
-      result = kind
+        (
+          kind = "user name" and
+          (
+            propertyName = "account" or
+            propertyName = "keyId" or
+            propertyName = "storageAccount" or
+            propertyName = "username"
+          )
+        )
+        or
+        (
+          kind = "password" and
+          (
+            propertyName = "key" or
+            propertyName = "apiKey" or
+            propertyName = "storageAccessKey" or
+            propertyName = "password"
+          )
+        )
+        or
+        (
+          kind = "token" and
+          (propertyName = "token")
+        )
+      )
     }
 
+    override string getCredentialsKind() { result = kind }
   }
-}
\ No newline at end of file
+}
diff --git a/javascript/ql/src/semmle/javascript/frameworks/PropertyProjection.qll b/javascript/ql/src/semmle/javascript/frameworks/PropertyProjection.qll
index ce2e5796e506..0dc6da152782 100644
--- a/javascript/ql/src/semmle/javascript/frameworks/PropertyProjection.qll
+++ b/javascript/ql/src/semmle/javascript/frameworks/PropertyProjection.qll
@@ -11,7 +11,6 @@ import javascript
  * A property projection call such as `_.get(o, 'a.b')`, which is equivalent to `o.a.b`.
  */
 abstract class CustomPropertyProjection extends DataFlow::CallNode {
-
   /**
    * Gets the argument for the object to project properties from, such as `o` in `_.get(o, 'a.b')`.
    */
@@ -26,14 +25,12 @@ abstract class CustomPropertyProjection extends DataFlow::CallNode {
    * Holds if this call returns the value of a single projected property, as opposed to an object that can contain multiple projected properties.
    */
   abstract predicate isSingletonProjection();
-
 }
 
 /**
  * A property projection call such as `_.get(o, 'a.b')`, which is equivalent to `o.a.b`.
  */
 class PropertyProjection extends DataFlow::CallNode {
-
   CustomPropertyProjection custom;
 
   PropertyProjection() { this = custom }
@@ -56,26 +53,26 @@ class PropertyProjection extends DataFlow::CallNode {
    * - This predicate does not hold for `_.pick({a: 'b', c: 'd'}}, 'a')`, which returns `{a: 'b'}`,
    */
   predicate isSingletonProjection() { custom.isSingletonProjection() }
-
 }
 
 /**
  * A simple model of common property projection functions.
  */
 private class SimplePropertyProjection extends CustomPropertyProjection {
-
   int objectIndex;
+
   int selectorIndex;
+
   boolean singleton;
 
   SimplePropertyProjection() {
-    exists (DataFlow::SourceNode callee |
-      this = callee.getACall() |
-      singleton = false and (
+    exists(DataFlow::SourceNode callee | this = callee.getACall() |
+      singleton = false and
+      (
         (
           callee = LodashUnderscore::member("pick") and
           objectIndex = 0 and
-          selectorIndex = [1..getNumArgument()]
+          selectorIndex = [1 .. getNumArgument()]
         )
         or
         (
@@ -84,10 +81,11 @@ private class SimplePropertyProjection extends CustomPropertyProjection {
           selectorIndex = 1
         )
         or
-        exists (string name |
+        exists(string name |
           name = "pick" or
           name = "pickAll" or
-          name = "pickBy" |
+          name = "pickBy"
+        |
           callee = DataFlow::moduleMember("ramda", name) and
           objectIndex = 1 and
           selectorIndex = 0
@@ -100,7 +98,8 @@ private class SimplePropertyProjection extends CustomPropertyProjection {
         )
       )
       or
-      singleton = true and (
+      singleton = true and
+      (
         (
           callee = LodashUnderscore::member("get") and
           objectIndex = 0 and
@@ -133,23 +132,19 @@ private class SimplePropertyProjection extends CustomPropertyProjection {
   override DataFlow::Node getASelector() { result = getArgument(selectorIndex) }
 
   override predicate isSingletonProjection() { singleton = true }
-
 }
 
 /**
  * A taint step for a property projection.
  */
 private class PropertyProjectionTaintStep extends TaintTracking::AdditionalTaintStep {
-
   PropertyProjection projection;
 
-  PropertyProjectionTaintStep() {
-    projection = this
-  }
+  PropertyProjectionTaintStep() { projection = this }
 
   override predicate step(DataFlow::Node pred, DataFlow::Node succ) {
     // reading from a tainted object yields a tainted result
     this = succ and
     pred = projection.getObject()
   }
-}
\ No newline at end of file
+}
diff --git a/javascript/ql/src/semmle/javascript/frameworks/React.qll b/javascript/ql/src/semmle/javascript/frameworks/React.qll
index d3face3d6a62..b747e445cb1c 100644
--- a/javascript/ql/src/semmle/javascript/frameworks/React.qll
+++ b/javascript/ql/src/semmle/javascript/frameworks/React.qll
@@ -16,9 +16,7 @@ DataFlow::SourceNode react() {
 /**
  * DEPRECATED: Use `react()` instead.
  */
-deprecated predicate isReactRef(DataFlowNode nd) {
-  react().flowsToExpr(nd)
-}
+deprecated predicate isReactRef(DataFlowNode nd) { react().flowsToExpr(nd) }
 
 /**
  * An object that implements the React component interface.
@@ -52,9 +50,7 @@ abstract class ReactComponent extends ASTNode {
   /**
    * Gets a reference to this component.
    */
-  DataFlow::Node ref() {
-    result.analyze().getAValue() = getAbstractComponent()
-  }
+  DataFlow::Node ref() { result.analyze().getAValue() = getAbstractComponent() }
 
   /**
    * Gets the `this` node in an instance method of this component.
@@ -68,19 +64,14 @@ abstract class ReactComponent extends ASTNode {
    *
    * DEPRECATED: Use `getAThisNode` instead.
    */
-  deprecated
-  DataFlow::SourceNode getAThisAccess() {
-    result = getAThisNode()
-  }
+  deprecated DataFlow::SourceNode getAThisAccess() { result = getAThisNode() }
 
   /**
    * Gets an access to the `props` object of this component.
    *
    * DEPRECATED: Use `getADirectPropsAccess` instead.
    */
-  deprecated DataFlow::SourceNode getAPropsSource() {
-    result = getADirectPropsAccess()
-  }
+  deprecated DataFlow::SourceNode getAPropsSource() { result = getADirectPropsAccess() }
 
   /**
    * Gets an access to the `props` object of this component.
@@ -92,9 +83,7 @@ abstract class ReactComponent extends ASTNode {
    *
    * DEPRECATED: Use `getADirectStateAccess` instead.
    */
-  deprecated DataFlow::SourceNode getAStateSource() {
-    result = getADirectStateAccess()
-  }
+  deprecated DataFlow::SourceNode getAStateSource() { result = getADirectStateAccess() }
 
   /**
    * Gets an access to the `state` object of this component.
@@ -106,9 +95,7 @@ abstract class ReactComponent extends ASTNode {
   /**
    * Gets a data flow node that reads a prop of this component.
    */
-  DataFlow::PropRead getAPropRead() {
-    getADirectPropsAccess().flowsTo(result.getBase())
-  }
+  DataFlow::PropRead getAPropRead() { getADirectPropsAccess().flowsTo(result.getBase()) }
 
   /**
    * Gets a data flow node that reads prop `name` of this component.
@@ -125,18 +112,14 @@ abstract class ReactComponent extends ASTNode {
   DataFlow::SourceNode getAStateAccess() {
     result = getADirectStateAccess()
     or
-    exists (DataFlow::PropRef prn | result = prn |
-      getAStateAccess().flowsTo(prn.getBase())
-    )
+    exists(DataFlow::PropRef prn | result = prn | getAStateAccess().flowsTo(prn.getBase()))
   }
 
   /**
    * Holds if this component specifies default values for (some of) its
    * props.
    */
-  predicate hasDefaultProps() {
-    exists (getADefaultPropsSource())
-  }
+  predicate hasDefaultProps() { exists(getADefaultPropsSource()) }
 
   /**
    * Gets the object that specifies default values for (some of) this
@@ -147,33 +130,31 @@ abstract class ReactComponent extends ASTNode {
   /**
    * Gets the render method of this component.
    */
-  Function getRenderMethod() {
-    result = getInstanceMethod("render")
-  }
+  Function getRenderMethod() { result = getInstanceMethod("render") }
 
   /**
    * Gets a call to method `name` on this component.
    */
-  DataFlow::MethodCallNode getAMethodCall(string name) {
-    result.calls(ref(), name)
-  }
+  DataFlow::MethodCallNode getAMethodCall(string name) { result.calls(ref(), name) }
 
   /**
    * Gets a value that will become (part of) the state
    * object of this component, for example an assignment to `this.state`.
    */
   DataFlow::SourceNode getACandidateStateSource() {
-    exists (DataFlow::PropWrite pwn, DataFlow::Node rhs |
+    exists(DataFlow::PropWrite pwn, DataFlow::Node rhs |
       // a direct definition: `this.state = o`
       result.flowsTo(rhs) and
       pwn.writes(ref(), "state", rhs)
     )
     or
-    exists (DataFlow::MethodCallNode mce, DataFlow::SourceNode arg0 |
+    exists(DataFlow::MethodCallNode mce, DataFlow::SourceNode arg0 |
       mce = getAMethodCall("setState") or
-      mce = getAMethodCall("forceUpdate") |
+      mce = getAMethodCall("forceUpdate")
+    |
       arg0.flowsTo(mce.getArgument(0)) and
-      if arg0 instanceof DataFlow::FunctionNode then
+      if arg0 instanceof DataFlow::FunctionNode
+      then
         // setState with callback: `this.setState(() => {foo: 42})`
         result.flowsTo(arg0.(DataFlow::FunctionNode).getAReturn())
       else
@@ -193,18 +174,22 @@ abstract class ReactComponent extends ASTNode {
    * `comoponentDidUpdate` method of this component.
    */
   DataFlow::SourceNode getAPreviousStateSource() {
-    exists (DataFlow::FunctionNode callback, int stateParameterIndex |
+    exists(DataFlow::FunctionNode callback, int stateParameterIndex |
       // "prevState" object as callback argument
-      callback.getParameter(stateParameterIndex).flowsTo(result) |
+      callback.getParameter(stateParameterIndex).flowsTo(result)
+    |
       // setState: (prevState, props)
       callback = getAMethodCall("setState").getCallback(0) and
       stateParameterIndex = 0
       or
-      stateParameterIndex = 1 and (
+      stateParameterIndex = 1 and
+      (
         // componentDidUpdate: (prevProps, prevState)
-        callback = getInstanceMethod("componentDidUpdate").flow() or
+        callback = getInstanceMethod("componentDidUpdate").flow()
+        or
         // getDerivedStateFromProps: (props, state)
-        callback = getStaticMethod("getDerivedStateFromProps").flow() or
+        callback = getStaticMethod("getDerivedStateFromProps").flow()
+        or
         // getSnapshotBeforeUpdate: (prevProps, prevState)
         callback = getInstanceMethod("getSnapshotBeforeUpdate").flow()
       )
@@ -231,8 +216,9 @@ abstract class ReactComponent extends ASTNode {
    * element that instantiates this component.
    */
   DataFlow::Node getACandidatePropsValue(string name) {
-    getACandidatePropsSource().hasPropertyWrite(name, result) or
-    exists (ReactJSXElement e, JSXAttribute attr |
+    getACandidatePropsSource().hasPropertyWrite(name, result)
+    or
+    exists(ReactJSXElement e, JSXAttribute attr |
       this = e.getComponent() and
       attr = e.getAttributeByName(name) and
       result.asExpr() = attr.getValue()
@@ -245,31 +231,34 @@ abstract class ReactComponent extends ASTNode {
    * `comoponentDidUpdate` method of this component.
    */
   DataFlow::SourceNode getAPreviousPropsSource() {
-    exists (DataFlow::FunctionNode callback, int propsParameterIndex |
+    exists(DataFlow::FunctionNode callback, int propsParameterIndex |
       // "prevProps" object as callback argument
-      callback.getParameter(propsParameterIndex).flowsTo(result) |
+      callback.getParameter(propsParameterIndex).flowsTo(result)
+    |
       // setState: (prevState, props)
       callback = getAMethodCall("setState").getCallback(0) and
       propsParameterIndex = 1
       or
-      propsParameterIndex = 0 and (
+      propsParameterIndex = 0 and
+      (
         // componentDidUpdate: (prevProps, prevState)
-        callback = getInstanceMethod("componentDidUpdate").flow() or
+        callback = getInstanceMethod("componentDidUpdate").flow()
+        or
         // getDerivedStateFromProps: (props, state)
-        callback = getStaticMethod("getDerivedStateFromProps").flow() or
+        callback = getStaticMethod("getDerivedStateFromProps").flow()
+        or
         // getSnapshotBeforeUpdate: (prevProps, prevState)
         callback = getInstanceMethod("getSnapshotBeforeUpdate").flow()
       )
     )
   }
-
 }
 
 /**
  * Holds if `f` always returns a JSX element or fragment, or a React element.
  */
 private predicate alwaysReturnsJSXOrReactElements(Function f) {
-  forex (Expr e | e.flow().(DataFlow::SourceNode).flowsToExpr(f.getAReturnedExpr()) |
+  forex(Expr e | e.flow().(DataFlow::SourceNode).flowsToExpr(f.getAReturnedExpr()) |
     e instanceof JSXNode or
     e instanceof ReactElementDefinition
   )
@@ -284,47 +273,37 @@ class FunctionalComponent extends ReactComponent, Function {
     // that always returns a JSX element or fragment, or a React
     // element is probably a component
     getNumParameter() = 1 and
-    exists (Parameter p | p = getParameter(0) |
+    exists(Parameter p | p = getParameter(0) |
       p.getName().regexpMatch("(?i).*props.*") or
       p instanceof ObjectPattern
     ) and
     alwaysReturnsJSXOrReactElements(this)
   }
 
-  override Function getInstanceMethod(string name) {
-    name = "render" and result = this
-  }
+  override Function getInstanceMethod(string name) { name = "render" and result = this }
 
-  override Function getStaticMethod(string name) {
-    none()
-  }
+  override Function getStaticMethod(string name) { none() }
 
   override DataFlow::SourceNode getADirectPropsAccess() {
     result = DataFlow::parameterNode(getParameter(0))
   }
 
-  override AbstractValue getAbstractComponent() {
-    result = AbstractInstance::of(this)
-  }
+  override AbstractValue getAbstractComponent() { result = AbstractInstance::of(this) }
 
-  override DataFlow::SourceNode getComponentCreatorSource() {
-    result = DataFlow::valueNode(this)
-  }
+  override DataFlow::SourceNode getComponentCreatorSource() { result = DataFlow::valueNode(this) }
 
   override DataFlow::SourceNode getADefaultPropsSource() {
-    exists (DataFlow::Node props |
+    exists(DataFlow::Node props |
       result.flowsTo(props) and
       DataFlow::valueNode(this).(DataFlow::SourceNode).hasPropertyWrite("defaultProps", props)
     )
   }
-
 }
 
 /**
  * A React/Preact component implemented as a class.
  */
-private abstract class SharedReactPreactClassComponent extends ReactComponent, ClassDefinition {
-
+abstract private class SharedReactPreactClassComponent extends ReactComponent, ClassDefinition {
   override Function getInstanceMethod(string name) {
     result = ClassDefinition.super.getInstanceMethod(name)
   }
@@ -342,13 +321,9 @@ private abstract class SharedReactPreactClassComponent extends ReactComponent, C
     result = DataFlow::parameterNode(getConstructor().getBody().getParameter(0))
   }
 
-  override AbstractValue getAbstractComponent() {
-    result = AbstractInstance::of(this)
-  }
+  override AbstractValue getAbstractComponent() { result = AbstractInstance::of(this) }
 
-  override DataFlow::SourceNode getComponentCreatorSource() {
-    result = DataFlow::valueNode(this)
-  }
+  override DataFlow::SourceNode getComponentCreatorSource() { result = DataFlow::valueNode(this) }
 
   override DataFlow::SourceNode getACandidateStateSource() {
     result = ReactComponent.super.getACandidateStateSource() or
@@ -356,46 +331,46 @@ private abstract class SharedReactPreactClassComponent extends ReactComponent, C
   }
 
   override DataFlow::SourceNode getADefaultPropsSource() {
-    exists (DataFlow::Node props |
+    exists(DataFlow::Node props |
       result.flowsTo(props) and
       DataFlow::valueNode(this).(DataFlow::SourceNode).hasPropertyWrite("defaultProps", props)
     )
   }
-
 }
 
 /**
  * A React component implemented as a class
  */
-abstract class ES2015Component extends SharedReactPreactClassComponent {
-
-}
+abstract class ES2015Component extends SharedReactPreactClassComponent { }
 
 /**
  * A React component implemented as a class extending `React.Component`
  * or `React.PureComponent`.
  */
 private class DefiniteES2015Component extends ES2015Component {
-
   DefiniteES2015Component() {
-    exists (DataFlow::SourceNode sup | sup.flowsToExpr(getSuperClass()) |
-      exists (PropAccess access, string globalReactName |
+    exists(DataFlow::SourceNode sup | sup.flowsToExpr(getSuperClass()) |
+      exists(PropAccess access, string globalReactName |
         (globalReactName = "react" or globalReactName = "React") and
-        access = sup.asExpr() |
+        access = sup.asExpr()
+      |
         access.getQualifiedName() = globalReactName + ".Component" or
-        access.getQualifiedName() = globalReactName + ".PureComponent") or
-        sup = DataFlow::moduleMember("react", "Component") or
-        sup = DataFlow::moduleMember("react", "PureComponent") or
-        sup.getAstNode() instanceof ES2015Component)
+        access.getQualifiedName() = globalReactName + ".PureComponent"
+      )
+      or
+      sup = DataFlow::moduleMember("react", "Component")
+      or
+      sup = DataFlow::moduleMember("react", "PureComponent")
+      or
+      sup.getAstNode() instanceof ES2015Component
+    )
   }
-
 }
 
 /**
  * A Preact component.
  */
 abstract class PreactComponent extends SharedReactPreactClassComponent {
-
   override DataFlow::SourceNode getADirectPropsAccess() {
     result = super.getADirectPropsAccess() or
     result = DataFlow::parameterNode(getInstanceMethod("render").getParameter(0))
@@ -405,25 +380,24 @@ abstract class PreactComponent extends SharedReactPreactClassComponent {
     result = super.getADirectStateAccess() or
     result = DataFlow::parameterNode(getInstanceMethod("render").getParameter(1))
   }
-
 }
 
 /**
  * A Preact component implemented as a class extending `Preact.Component`.
  */
 private class DefinitePreactComponent extends PreactComponent {
-
   DefinitePreactComponent() {
-    exists (DataFlow::SourceNode sup | sup.flowsToExpr(getSuperClass()) |
-      exists (PropAccess access, string globalPreactName |
+    exists(DataFlow::SourceNode sup | sup.flowsToExpr(getSuperClass()) |
+      exists(PropAccess access, string globalPreactName |
         (globalPreactName = "preact" or globalPreactName = "Preact") and
-        access = sup.asExpr() |
+        access = sup.asExpr()
+      |
         access.getQualifiedName() = globalPreactName + ".Component" or
         sup = DataFlow::moduleMember("preact", "Component") or
-        sup.getAstNode() instanceof PreactComponent)
+        sup.getAstNode() instanceof PreactComponent
+      )
     )
   }
-
 }
 
 /**
@@ -432,20 +406,18 @@ private class DefinitePreactComponent extends PreactComponent {
  * - extends class called `Component`
  * - has a `render` method that returns JSX or React elements.
  */
-private class HeuristicReactPreactComponent extends ClassDefinition, PreactComponent, ES2015Component {
-
+private class HeuristicReactPreactComponent extends ClassDefinition, PreactComponent,
+  ES2015Component {
   HeuristicReactPreactComponent() {
     any(DataFlow::GlobalVarRefNode c | c.getName() = "Component").flowsToExpr(getSuperClass()) and
     alwaysReturnsJSXOrReactElements(ClassDefinition.super.getInstanceMethod("render"))
   }
-
 }
 
 /**
  * A legacy React component implemented using `React.createClass` or `create-react-class`.
  */
 class ES5Component extends ReactComponent, ObjectExpr {
-
   DataFlow::CallNode create;
 
   ES5Component() {
@@ -459,25 +431,17 @@ class ES5Component extends ReactComponent, ObjectExpr {
     create.getArgument(0).getALocalSource().asExpr() = this
   }
 
-  override Function getInstanceMethod(string name) {
-    result = getPropertyByName(name).getInit()
-  }
+  override Function getInstanceMethod(string name) { result = getPropertyByName(name).getInit() }
 
-  override Function getStaticMethod(string name) {
-    none()
-  }
+  override Function getStaticMethod(string name) { none() }
 
   override DataFlow::SourceNode getADirectPropsAccess() {
     result.(DataFlow::PropRef).accesses(ref(), "props")
   }
 
-  override AbstractValue getAbstractComponent() {
-    result = TAbstractObjectLiteral(this)
-  }
+  override AbstractValue getAbstractComponent() { result = TAbstractObjectLiteral(this) }
 
-  override DataFlow::SourceNode getComponentCreatorSource() {
-    result = create
-  }
+  override DataFlow::SourceNode getComponentCreatorSource() { result = create }
 
   override DataFlow::SourceNode getACandidateStateSource() {
     result = ReactComponent.super.getACandidateStateSource() or
@@ -485,35 +449,29 @@ class ES5Component extends ReactComponent, ObjectExpr {
   }
 
   override DataFlow::SourceNode getADefaultPropsSource() {
-    exists (Function f |
+    exists(Function f |
       f = getInstanceMethod("getDefaultProps") and
       result.flowsToExpr(f.getAReturnedExpr())
     )
   }
-
 }
 
 /**
  * A DOM element created by a React function.
  */
 abstract class ReactElementDefinition extends DOM::ElementDefinition {
-
-  override DOM::ElementDefinition getParent() {
-    none()
-  }
+  override DOM::ElementDefinition getParent() { none() }
 
   /**
    * Gets the `props` argument of this definition.
    */
   abstract DataFlow::Node getProps();
-
 }
 
 /**
  * A DOM element created by the `React.createElement` function.
  */
 private class CreateElementDefinition extends ReactElementDefinition {
-
   DataFlow::MethodCallNode call;
 
   CreateElementDefinition() {
@@ -521,21 +479,15 @@ private class CreateElementDefinition extends ReactElementDefinition {
     call = react().getAMethodCall("createElement")
   }
 
-  override string getName() {
-    call.getArgument(0).mayHaveStringValue(result)
-  }
-
-  override DataFlow::Node getProps() {
-    result = call.getArgument(1)
-  }
+  override string getName() { call.getArgument(0).mayHaveStringValue(result) }
 
+  override DataFlow::Node getProps() { result = call.getArgument(1) }
 }
 
 /**
  * A DOM element created by the (legacy) `React.createFactory` function.
  */
 private class FactoryDefinition extends ReactElementDefinition {
-
   DataFlow::MethodCallNode factory;
 
   DataFlow::CallNode call;
@@ -546,14 +498,9 @@ private class FactoryDefinition extends ReactElementDefinition {
     factory = react().getAMethodCall("createFactory")
   }
 
-  override string getName() {
-    factory.getArgument(0).mayHaveStringValue(result)
-  }
-
-  override DataFlow::Node getProps() {
-    result = call.getArgument(0)
-  }
+  override string getName() { factory.getArgument(0).mayHaveStringValue(result) }
 
+  override DataFlow::Node getProps() { result = call.getArgument(0) }
 }
 
 /**
@@ -565,14 +512,14 @@ private class FactoryDefinition extends ReactElementDefinition {
  * still infer the ordinary abstract value.
  */
 private class AnalyzedThisInBoundCallback extends AnalyzedNode, DataFlow::ThisNode {
-
   AnalyzedNode thisSource;
 
   AnalyzedThisInBoundCallback() {
     exists(DataFlow::CallNode bindingCall, string binderName |
       // React.Children.map or React.Children.forEach
       binderName = "map" or
-      binderName = "forEach" |
+      binderName = "forEach"
+    |
       bindingCall = react().getAPropertyRead("Children").getAMemberCall(binderName) and
       3 = bindingCall.getNumArgument() and
       getBinder() = bindingCall.getCallback(1) and
@@ -584,24 +531,18 @@ private class AnalyzedThisInBoundCallback extends AnalyzedNode, DataFlow::ThisNo
     result = thisSource.getALocalValue() or
     result = AnalyzedNode.super.getALocalValue()
   }
-
 }
 
 /**
  * A `JSXElement` that instantiates a `ReactComponent`.
  */
 private class ReactJSXElement extends JSXElement {
-
   ReactComponent component;
 
-  ReactJSXElement() {
-    component.getComponentCreatorSource().flowsToExpr(getNameExpr())
-  }
+  ReactJSXElement() { component.getComponentCreatorSource().flowsToExpr(getNameExpr()) }
 
   /**
    * Gets the component this element instantiates.
    */
-  ReactComponent getComponent() {
-    result = component
-  }
-}
\ No newline at end of file
+  ReactComponent getComponent() { result = component }
+}
diff --git a/javascript/ql/src/semmle/javascript/frameworks/Request.qll b/javascript/ql/src/semmle/javascript/frameworks/Request.qll
index 45406863aba1..f7592e1a0a06 100644
--- a/javascript/ql/src/semmle/javascript/frameworks/Request.qll
+++ b/javascript/ql/src/semmle/javascript/frameworks/Request.qll
@@ -1,48 +1,57 @@
 /**
  * Provides classes for working with [request](https://github.com/request/request) applications.
  */
+
 import javascript
 
 module Request {
-
   /** A credentials expression that is used for authentication. */
   class Credentials extends CredentialsExpr {
-
     string kind;
 
     Credentials() {
-      exists (DataFlow::ModuleImportNode mod, DataFlow::CallNode action |
+      exists(DataFlow::ModuleImportNode mod, DataFlow::CallNode action |
         mod.getPath() = "request" and
         (
           // default form: `request(...)`
-          action = mod.getAnInvocation() or
+          action = mod.getAnInvocation()
+          or
           // specialized form: `request.get(...)`
           action = mod.getAMemberCall(any(HTTP::RequestMethodName n).toLowerCase())
-        ) |
-        exists (MethodCallExpr auth, int argIndex |
+        )
+      |
+        exists(MethodCallExpr auth, int argIndex |
           // request.get(url).auth('username', 'password', _, 'token');
           auth = action.getAMemberCall("auth").asExpr() and
-          this = auth.getArgument(argIndex) |
-          (argIndex = 0 and kind = "user name") or
-          (argIndex = 1 and kind = "password") or
+          this = auth.getArgument(argIndex)
+        |
+          (argIndex = 0 and kind = "user name")
+          or
+          (argIndex = 1 and kind = "password")
+          or
           (argIndex = 3 and kind = "token")
-        ) or
-        exists (DataFlow::ObjectLiteralNode auth, string propertyName |
+        )
+        or
+        exists(DataFlow::ObjectLiteralNode auth, string propertyName |
           // request.get(url, { auth: {user: 'username', pass: 'password', bearer: 'token'}})
           auth.flowsTo(action.getOptionArgument(1, "auth")) and
-          auth.hasPropertyWrite(propertyName, DataFlow::valueNode(this)) |
-          ((propertyName = "user" or propertyName = "username") and kind = "user name") or
-          ((propertyName = "pass" or propertyName = "password") and kind = "password") or
+          auth.hasPropertyWrite(propertyName, DataFlow::valueNode(this))
+        |
+          (
+            (propertyName = "user" or propertyName = "username") and
+            kind = "user name"
+          )
+          or
+          (
+            (propertyName = "pass" or propertyName = "password") and
+            kind = "password"
+          )
+          or
           (propertyName = "bearer" and kind = "token")
         )
       )
     }
 
-
-    override string getCredentialsKind() {
-      result = kind
-    }
-
+    override string getCredentialsKind() { result = kind }
   }
-
-}
\ No newline at end of file
+}
diff --git a/javascript/ql/src/semmle/javascript/frameworks/Restify.qll b/javascript/ql/src/semmle/javascript/frameworks/Restify.qll
index 1b4f37f747ad..70dbe2e5e0bc 100644
--- a/javascript/ql/src/semmle/javascript/frameworks/Restify.qll
+++ b/javascript/ql/src/semmle/javascript/frameworks/Restify.qll
@@ -1,6 +1,7 @@
 /**
  * Provides classes for working with [Restify](https://restify.com/) servers.
  */
+
 import javascript
 import semmle.javascript.frameworks.HTTP
 
@@ -8,7 +9,8 @@ module Restify {
   /**
    * An expression that creates a new Restify server.
    */
-  class ServerDefinition extends HTTP::Servers::StandardServerDefinition, CallExpr, DataFlow::TrackedExpr {
+  class ServerDefinition extends HTTP::Servers::StandardServerDefinition, CallExpr,
+    DataFlow::TrackedExpr {
     ServerDefinition() {
       // `server = restify.createServer()`
       this = DataFlow::moduleMember("restify", "createServer").getACall().asExpr()
@@ -19,7 +21,6 @@ module Restify {
    * A Restify route handler.
    */
   class RouteHandler extends HTTP::Servers::StandardRouteHandler, DataFlow::ValueNode {
-
     Function function;
 
     RouteHandler() {
@@ -30,16 +31,12 @@ module Restify {
     /**
      * Gets the parameter of the route handler that contains the request object.
      */
-    SimpleParameter getRequestParameter() {
-      result = function.getParameter(0)
-    }
+    SimpleParameter getRequestParameter() { result = function.getParameter(0) }
 
     /**
      * Gets the parameter of the route handler that contains the response object.
      */
-    SimpleParameter getResponseParameter() {
-      result = function.getParameter(1)
-    }
+    SimpleParameter getResponseParameter() { result = function.getParameter(1) }
   }
 
   /**
@@ -49,16 +46,12 @@ module Restify {
   private class ResponseSource extends HTTP::Servers::ResponseSource {
     RouteHandler rh;
 
-    ResponseSource() {
-      this = DataFlow::parameterNode(rh.getResponseParameter())
-    }
+    ResponseSource() { this = DataFlow::parameterNode(rh.getResponseParameter()) }
 
     /**
      * Gets the route handler that provides this response.
      */
-    override RouteHandler getRouteHandler() {
-      result = rh
-    }
+    override RouteHandler getRouteHandler() { result = rh }
   }
 
   /**
@@ -68,16 +61,12 @@ module Restify {
   private class RequestSource extends HTTP::Servers::RequestSource {
     RouteHandler rh;
 
-    RequestSource() {
-      this = DataFlow::parameterNode(rh.getRequestParameter())
-    }
+    RequestSource() { this = DataFlow::parameterNode(rh.getRequestParameter()) }
 
     /**
      * Gets the route handler that handles this request.
      */
-    override RouteHandler getRouteHandler() {
-      result = rh
-    }
+    override RouteHandler getRouteHandler() { result = rh }
   }
 
   /**
@@ -99,28 +88,31 @@ module Restify {
    */
   private class RequestInputAccess extends HTTP::RequestInputAccess {
     RequestExpr request;
+
     string kind;
 
     RequestInputAccess() {
-      exists (MethodCallExpr query |
+      exists(MethodCallExpr query |
         // `request.getQuery().<name>`
         kind = "parameter" and
         query.calls(request, "getQuery") and
         this.asExpr().(PropAccess).accesses(query, _)
       )
       or
-      exists (string methodName |
+      exists(string methodName |
         // `request.href()` or `request.getPath()`
         kind = "url" and
-        this.asExpr().(MethodCallExpr).calls(request, methodName) |
+        this.asExpr().(MethodCallExpr).calls(request, methodName)
+      |
         methodName = "href" or
         methodName = "getPath"
       )
       or
-      exists (string methodName |
+      exists(string methodName |
         // `request.getContentType()`, `request.userAgent()`, `request.trailer(...)`, `request.header(...)`
         kind = "header" and
-        this.asExpr().(MethodCallExpr).calls(request, methodName) |
+        this.asExpr().(MethodCallExpr).calls(request, methodName)
+      |
         methodName = "getContentType" or
         methodName = "userAgent" or
         methodName = "trailer" or
@@ -132,30 +124,22 @@ module Restify {
       this.asExpr().(PropAccess).accesses(request, "cookies")
     }
 
-    override RouteHandler getRouteHandler() {
-      result = request.getRouteHandler()
-    }
+    override RouteHandler getRouteHandler() { result = request.getRouteHandler() }
 
-    override string getKind() {
-      result = kind
-    }
+    override string getKind() { result = kind }
   }
 
   /**
    * An HTTP header defined in a Restify server.
    */
   private class HeaderDefinition extends HTTP::Servers::StandardHeaderDefinition {
-
     HeaderDefinition() {
       // response.header('Cache-Control', 'no-cache')
       astNode.getReceiver() instanceof ResponseExpr and
       astNode.getMethodName() = "header"
     }
 
-    override RouteHandler getRouteHandler(){
-      astNode.getReceiver() = result.getAResponseExpr()
-    }
-
+    override RouteHandler getRouteHandler() { astNode.getReceiver() = result.getAResponseExpr() }
   }
 
   /**
@@ -171,12 +155,8 @@ module Restify {
       getMethodName() = any(HTTP::RequestMethodName m).toLowerCase()
     }
 
-    override DataFlow::SourceNode getARouteHandler() {
-      result.flowsToExpr(getArgument(1))
-    }
+    override DataFlow::SourceNode getARouteHandler() { result.flowsToExpr(getArgument(1)) }
 
-    override Expr getServer() {
-      result = server
-    }
+    override Expr getServer() { result = server }
   }
 }
diff --git a/javascript/ql/src/semmle/javascript/frameworks/SQL.qll b/javascript/ql/src/semmle/javascript/frameworks/SQL.qll
index f933b25b4776..0bdc8e9036e8 100644
--- a/javascript/ql/src/semmle/javascript/frameworks/SQL.qll
+++ b/javascript/ql/src/semmle/javascript/frameworks/SQL.qll
@@ -6,8 +6,7 @@ import javascript
 
 module SQL {
   /** A string-valued expression that is interpreted as a SQL command. */
-  abstract class SqlString extends Expr {
-  }
+  abstract class SqlString extends Expr { }
 
   /**
    * An expression that sanitizes a string to make it safe to embed into
@@ -15,17 +14,14 @@ module SQL {
    */
   abstract class SqlSanitizer extends Expr {
     Expr input;
+
     Expr output;
 
     /** Gets the input expression being sanitized. */
-    Expr getInput() {
-      result = input
-    }
+    Expr getInput() { result = input }
 
     /** Gets the output expression containing the sanitized value. */
-    Expr getOutput() {
-      result = output
-    }
+    Expr getOutput() { result = output }
   }
 }
 
@@ -34,9 +30,7 @@ module SQL {
  */
 private module MySql {
   /** Gets the package name `mysql` or `mysql2`. */
-  string mysql() {
-    result = "mysql" or result = "mysql2"
-  }
+  string mysql() { result = "mysql" or result = "mysql2" }
 
   /** Gets a call to `mysql.createConnection`. */
   DataFlow::SourceNode createConnection() {
@@ -60,8 +54,7 @@ private module MySql {
     override MethodCallExpr astNode;
 
     QueryCall() {
-      exists (DataFlow::SourceNode recv |
-        recv = createPool() or recv = connection() |
+      exists(DataFlow::SourceNode recv | recv = createPool() or recv = connection() |
         this = recv.getAMethodCall("query")
       )
     }
@@ -73,20 +66,20 @@ private module MySql {
 
   /** An expression that is passed to the `query` method and hence interpreted as SQL. */
   class QueryString extends SQL::SqlString {
-    QueryString() {
-      this = any(QueryCall qc).getAQueryArgument().asExpr()
-    }
+    QueryString() { this = any(QueryCall qc).getAQueryArgument().asExpr() }
   }
 
   /** A call to the `escape` or `escapeId` method that performs SQL sanitization. */
   class EscapingSanitizer extends SQL::SqlSanitizer, @callexpr {
     EscapingSanitizer() {
-      exists (string esc | esc = "escape" or esc = "escapeId" |
-        exists (DataFlow::SourceNode escape, MethodCallExpr mce |
+      exists(string esc | esc = "escape" or esc = "escapeId" |
+        exists(DataFlow::SourceNode escape, MethodCallExpr mce |
           escape = DataFlow::moduleMember(mysql(), esc) or
           escape = connection().getAPropertyRead(esc) or
-          escape = createPool().getAPropertyRead(esc) |
-          this = mce and mce = escape.getACall().asExpr() and
+          escape = createPool().getAPropertyRead(esc)
+        |
+          this = mce and
+          mce = escape.getACall().asExpr() and
           input = mce.getArgument(0) and
           output = mce
         )
@@ -99,21 +92,18 @@ private module MySql {
     string kind;
 
     Credentials() {
-      exists (DataFlow::SourceNode call, string prop |
-        (call = createConnection() or call = createPool())
-        and
-        call.asExpr().(CallExpr).hasOptionArgument(0, prop, this)
-        and
+      exists(DataFlow::SourceNode call, string prop |
+        (call = createConnection() or call = createPool()) and
+        call.asExpr().(CallExpr).hasOptionArgument(0, prop, this) and
         (
-          prop = "user" and kind = "user name" or
+          prop = "user" and kind = "user name"
+          or
           prop = "password" and kind = prop
         )
       )
     }
 
-    override string getCredentialsKind() {
-      result = kind
-    }
+    override string getCredentialsKind() { result = kind }
   }
 }
 
@@ -148,8 +138,7 @@ private module Postgres {
     override MethodCallExpr astNode;
 
     QueryCall() {
-      exists (DataFlow::SourceNode recv |
-        recv = client() or recv = newPool() |
+      exists(DataFlow::SourceNode recv | recv = client() or recv = newPool() |
         this = recv.getAMethodCall("query")
       )
     }
@@ -161,9 +150,7 @@ private module Postgres {
 
   /** An expression that is passed to the `query` method and hence interpreted as SQL. */
   class QueryString extends SQL::SqlString {
-    QueryString() {
-      this = any(QueryCall qc).getAQueryArgument().asExpr()
-    }
+    QueryString() { this = any(QueryCall qc).getAQueryArgument().asExpr() }
   }
 
   /** An expression that is passed as user name or password when creating a client or a pool. */
@@ -171,21 +158,18 @@ private module Postgres {
     string kind;
 
     Credentials() {
-      exists (DataFlow::InvokeNode call, string prop |
-        (call = newClient() or call = newPool())
-        and
-        this = call.getOptionArgument(0, prop).asExpr()
-        and
+      exists(DataFlow::InvokeNode call, string prop |
+        (call = newClient() or call = newPool()) and
+        this = call.getOptionArgument(0, prop).asExpr() and
         (
-          prop = "user" and kind = "user name" or
+          prop = "user" and kind = "user name"
+          or
           prop = "password" and kind = prop
         )
       )
     }
 
-    override string getCredentialsKind() {
-      result = kind
-    }
+    override string getCredentialsKind() { result = kind }
   }
 }
 
@@ -211,8 +195,14 @@ private module Sqlite {
     override MethodCallExpr astNode;
 
     QueryCall() {
-      exists (string meth |
-        meth = "all" or meth = "each" or meth = "exec" or meth = "get" or meth = "prepare" or meth = "run" |
+      exists(string meth |
+        meth = "all" or
+        meth = "each" or
+        meth = "exec" or
+        meth = "get" or
+        meth = "prepare" or
+        meth = "run"
+      |
         this = newDb().getAMethodCall(meth)
       )
     }
@@ -224,9 +214,7 @@ private module Sqlite {
 
   /** An expression that is passed to the `query` method and hence interpreted as SQL. */
   class QueryString extends SQL::SqlString {
-    QueryString() {
-      this = any(QueryCall qc).getAQueryArgument().asExpr()
-    }
+    QueryString() { this = any(QueryCall qc).getAQueryArgument().asExpr() }
   }
 }
 
@@ -235,9 +223,7 @@ private module Sqlite {
  */
 private module MsSql {
   /** Gets a reference to the `mssql` module. */
-  DataFlow::ModuleImportNode mssql() {
-    result.getPath() = "mssql"
-  }
+  DataFlow::ModuleImportNode mssql() { result.getPath() = "mssql" }
 
   /** Gets an expression that creates a request object. */
   DataFlow::SourceNode request() {
@@ -252,9 +238,7 @@ private module MsSql {
   private class QueryTemplateExpr extends DatabaseAccess, DataFlow::ValueNode {
     override TaggedTemplateExpr astNode;
 
-    QueryTemplateExpr() {
-      mssql().getAPropertyRead("query").flowsToExpr(astNode.getTag())
-    }
+    QueryTemplateExpr() { mssql().getAPropertyRead("query").flowsToExpr(astNode.getTag()) }
 
     override DataFlow::Node getAQueryArgument() {
       result = DataFlow::valueNode(astNode.getTemplate().getAnElement())
@@ -266,9 +250,7 @@ private module MsSql {
     override MethodCallExpr astNode;
 
     QueryCall() {
-      exists (string meth | this = request().getAMethodCall(meth) |
-        meth = "query" or meth = "batch"
-      )
+      exists(string meth | this = request().getAMethodCall(meth) | meth = "query" or meth = "batch")
     }
 
     override DataFlow::Node getAQueryArgument() {
@@ -279,8 +261,7 @@ private module MsSql {
   /** An expression that is passed to a method that interprets it as SQL. */
   class QueryString extends SQL::SqlString {
     QueryString() {
-      exists (DatabaseAccess dba |
-        dba instanceof QueryTemplateExpr or dba instanceof QueryCall |
+      exists(DatabaseAccess dba | dba instanceof QueryTemplateExpr or dba instanceof QueryCall |
         this = dba.getAQueryArgument().asExpr()
       )
     }
@@ -290,7 +271,8 @@ private module MsSql {
   class QueryTemplateSanitizer extends SQL::SqlSanitizer {
     QueryTemplateSanitizer() {
       this = any(QueryTemplateExpr qte).getAQueryArgument().asExpr() and
-      input = this and output = this
+      input = this and
+      output = this
     }
   }
 
@@ -299,25 +281,22 @@ private module MsSql {
     string kind;
 
     Credentials() {
-      exists (DataFlow::InvokeNode call, string prop |
+      exists(DataFlow::InvokeNode call, string prop |
         (
-         call = mssql().getAMemberCall("connect")
-         or
-         call = mssql().getAConstructorInvocation("ConnectionPool")
-        )
-        and
-        this = call.getOptionArgument(0, prop).asExpr()
-        and
+          call = mssql().getAMemberCall("connect")
+          or
+          call = mssql().getAConstructorInvocation("ConnectionPool")
+        ) and
+        this = call.getOptionArgument(0, prop).asExpr() and
         (
-          prop = "user" and kind = "user name" or
+          prop = "user" and kind = "user name"
+          or
           prop = "password" and kind = prop
         )
       )
     }
 
-    override string getCredentialsKind() {
-      result = kind
-    }
+    override string getCredentialsKind() { result = kind }
   }
 }
 
@@ -326,22 +305,16 @@ private module MsSql {
  */
 private module Sequelize {
   /** Gets an import of the `sequelize` module. */
-  DataFlow::ModuleImportNode sequelize() {
-    result.getPath() = "sequelize"
-  }
+  DataFlow::ModuleImportNode sequelize() { result.getPath() = "sequelize" }
 
   /** Gets an expression that creates an instance of the `Sequelize` class. */
-  DataFlow::SourceNode newSequelize() {
-    result = sequelize().getAnInstantiation()
-  }
+  DataFlow::SourceNode newSequelize() { result = sequelize().getAnInstantiation() }
 
   /** A call to `Sequelize.query`. */
   private class QueryCall extends DatabaseAccess, DataFlow::ValueNode {
     override MethodCallExpr astNode;
 
-    QueryCall() {
-      this = newSequelize().getAMethodCall("query")
-    }
+    QueryCall() { this = newSequelize().getAMethodCall("query") }
 
     override DataFlow::Node getAQueryArgument() {
       result = DataFlow::valueNode(astNode.getArgument(0))
@@ -350,9 +323,7 @@ private module Sequelize {
 
   /** An expression that is passed to `Sequelize.query` method and hence interpreted as SQL. */
   class QueryString extends SQL::SqlString {
-    QueryString() {
-      this = any(QueryCall qc).getAQueryArgument().asExpr()
-    }
+    QueryString() { this = any(QueryCall qc).getAQueryArgument().asExpr() }
   }
 
   /**
@@ -363,28 +334,24 @@ private module Sequelize {
     string kind;
 
     Credentials() {
-      exists (NewExpr ne, string prop |
-        ne = newSequelize().asExpr()
-        and
+      exists(NewExpr ne, string prop |
+        ne = newSequelize().asExpr() and
         (
-         this = ne.getArgument(1) and prop = "username"
-         or
-         this = ne.getArgument(2) and prop = "password"
-         or
-         ne.hasOptionArgument(ne.getNumArgument()-1, prop, this)
-        )
-        and
+          this = ne.getArgument(1) and prop = "username"
+          or
+          this = ne.getArgument(2) and prop = "password"
+          or
+          ne.hasOptionArgument(ne.getNumArgument() - 1, prop, this)
+        ) and
         (
-         prop = "username" and kind = "user name"
-         or
-         prop = "password" and kind = prop
+          prop = "username" and kind = "user name"
+          or
+          prop = "password" and kind = prop
         )
       )
     }
 
-    override string getCredentialsKind() {
-      result = kind
-    }
+    override string getCredentialsKind() { result = kind }
   }
 }
 
@@ -432,9 +399,7 @@ private module Spanner {
      * Gets the position of the query argument; default is zero, which can be overridden
      * by subclasses.
      */
-    int getQueryArgumentPosition() {
-      result = 0
-    }
+    int getQueryArgumentPosition() { result = 0 }
 
     override DataFlow::Node getAQueryArgument() {
       result = getArgument(getQueryArgumentPosition()) or
@@ -447,7 +412,7 @@ private module Spanner {
    */
   class DatabaseRunCall extends SqlExecution {
     DatabaseRunCall() {
-      exists (string run | run = "run" or run = "runPartitionedUpdate" or run = "runStream" |
+      exists(string run | run = "run" or run = "runPartitionedUpdate" or run = "runStream" |
         this = database().getAMethodCall(run)
       )
     }
@@ -458,7 +423,7 @@ private module Spanner {
    */
   class TransactionRunCall extends SqlExecution {
     TransactionRunCall() {
-      exists (string run | run = "run" or run = "runStream" or run = "runUpdate" |
+      exists(string run | run = "run" or run = "runStream" or run = "runUpdate" |
         this = transaction().getAMethodCall(run)
       )
     }
@@ -469,7 +434,7 @@ private module Spanner {
    */
   class ExecuteSqlCall extends SqlExecution {
     ExecuteSqlCall() {
-      exists (string exec | exec = "executeSql" or exec = "executeStreamingSql" |
+      exists(string exec | exec = "executeSql" or exec = "executeStreamingSql" |
         this = v1SpannerClient().getAMethodCall(exec)
       )
     }
@@ -484,8 +449,6 @@ private module Spanner {
    * An expression that is interpreted as a SQL string.
    */
   class QueryString extends SQL::SqlString {
-    QueryString() {
-      this = any(SqlExecution se).getAQueryArgument().asExpr()
-    }
+    QueryString() { this = any(SqlExecution se).getAQueryArgument().asExpr() }
   }
 }
diff --git a/javascript/ql/src/semmle/javascript/frameworks/StringFormatters.qll b/javascript/ql/src/semmle/javascript/frameworks/StringFormatters.qll
index b67f09f9cd51..fb93d866d07b 100644
--- a/javascript/ql/src/semmle/javascript/frameworks/StringFormatters.qll
+++ b/javascript/ql/src/semmle/javascript/frameworks/StringFormatters.qll
@@ -25,16 +25,16 @@ abstract class PrintfStyleCall extends DataFlow::CallNode {
 }
 
 private class LibraryFormatter extends PrintfStyleCall {
-
   int formatIndex;
 
   boolean returns;
 
   LibraryFormatter() {
     // built-in Node.js functions
-    exists (string mod, string meth |
+    exists(string mod, string meth |
       returns = false and
-      mod = "console" and (
+      mod = "console" and
+      (
         (
           meth = "debug" or
           meth = "error" or
@@ -49,12 +49,14 @@ private class LibraryFormatter extends PrintfStyleCall {
       )
       or
       returns = true and
-      mod = "util" and (
-        (meth = "format" or meth = "log") and formatIndex = 0
+      mod = "util" and
+      (
+        (meth = "format" or meth = "log") and
+        formatIndex = 0
         or
         meth = "formatWithOptions" and formatIndex = 1
       )
-      |
+    |
       // `console` and `util` are available both as modules...
       this = DataFlow::moduleMember(mod, meth).getACall()
       or
@@ -62,13 +64,14 @@ private class LibraryFormatter extends PrintfStyleCall {
       this = DataFlow::globalVarRef(mod).getAMemberCall(meth)
     )
     or
-    returns = true and (
+    returns = true and
+    (
       // https://www.npmjs.com/package/printf
       this = DataFlow::moduleImport("printf").getACall() and
-      formatIndex in [0..1]
+      formatIndex in [0 .. 1]
       or
       // https://www.npmjs.com/package/printj
-      exists (string fn | fn = "sprintf" or fn = "vsprintf" |
+      exists(string fn | fn = "sprintf" or fn = "vsprintf" |
         this = DataFlow::moduleMember("printj", fn).getACall() and
         formatIndex = 0
       )
@@ -85,24 +88,19 @@ private class LibraryFormatter extends PrintfStyleCall {
       formatIndex = 0
       or
       // https://www.npmjs.com/package/sprintf-js
-      exists (string meth | meth = "sprintf" or meth = "vsprintf" |
+      exists(string meth | meth = "sprintf" or meth = "vsprintf" |
         this = DataFlow::moduleMember("sprintf-js", meth).getACall() and
         formatIndex = 0
       )
     )
   }
 
-  override DataFlow::Node getFormatString() {
-    result = getArgument(formatIndex)
-  }
+  override DataFlow::Node getFormatString() { result = getArgument(formatIndex) }
 
   override DataFlow::Node getFormatArgument(int i) {
     i >= 0 and
     result = getArgument(formatIndex + 1 + i)
   }
 
-  override predicate returnsFormatted() {
-    returns = true
-  }
-
+  override predicate returnsFormatted() { returns = true }
 }
diff --git a/javascript/ql/src/semmle/javascript/frameworks/Templating.qll b/javascript/ql/src/semmle/javascript/frameworks/Templating.qll
index 49d67a1152ec..08097dc46932 100644
--- a/javascript/ql/src/semmle/javascript/frameworks/Templating.qll
+++ b/javascript/ql/src/semmle/javascript/frameworks/Templating.qll
@@ -9,16 +9,26 @@ module Templating {
    * Gets a string that is a known template delimiter.
    */
   string getADelimiter() {
-    result = "<%" or result = "%>" or
-    result = "{{" or result = "}}" or
-    result = "{%" or result = "%}" or
-    result = "<@" or result = "@>" or
-    result = "<#" or result = "#>" or
-    result = "{#" or result = "#}" or
-    result = "{$" or result = "$}" or
-    result = "[%" or result = "%]" or
-    result = "[[" or result = "]]" or
-    result = "<?" or result = "?>"
+    result = "<%" or
+    result = "%>" or
+    result = "{{" or
+    result = "}}" or
+    result = "{%" or
+    result = "%}" or
+    result = "<@" or
+    result = "@>" or
+    result = "<#" or
+    result = "#>" or
+    result = "{#" or
+    result = "#}" or
+    result = "{$" or
+    result = "$}" or
+    result = "[%" or
+    result = "%]" or
+    result = "[[" or
+    result = "]]" or
+    result = "<?" or
+    result = "?>"
   }
 
   /**
@@ -27,6 +37,6 @@ module Templating {
    * storing it in its first (and only) capture group.
    */
   string getDelimiterMatchingRegexp() {
-    result = ".*(" + concat("\\Q" + getADelimiter() + "\\E", "|") +  ").*"
+    result = ".*(" + concat("\\Q" + getADelimiter() + "\\E", "|") + ").*"
   }
 }
diff --git a/javascript/ql/src/semmle/javascript/frameworks/Testing.qll b/javascript/ql/src/semmle/javascript/frameworks/Testing.qll
index 06d508bef9f6..e8f6aea8931d 100644
--- a/javascript/ql/src/semmle/javascript/frameworks/Testing.qll
+++ b/javascript/ql/src/semmle/javascript/frameworks/Testing.qll
@@ -9,15 +9,14 @@ import semmle.javascript.frameworks.TestingCustomizations
 /**
  * A syntactic construct that represents a single test.
  */
-abstract class Test extends Locatable {
-}
+abstract class Test extends Locatable { }
 
 /**
  * A QUnit test, that is, an invocation of `QUnit.test`.
  */
 class QUnitTest extends Test, @callexpr {
   QUnitTest() {
-    exists (MethodCallExpr mce | mce = this |
+    exists(MethodCallExpr mce | mce = this |
       mce.getReceiver().(VarAccess).getName() = "QUnit" and
       mce.getMethodName() = "test"
     )
@@ -31,7 +30,7 @@ class QUnitTest extends Test, @callexpr {
  */
 class BDDTest extends Test, @callexpr {
   BDDTest() {
-    exists (CallExpr call | call = this |
+    exists(CallExpr call | call = this |
       call.getCallee().(VarAccess).getName() = "it" and
       exists(call.getArgument(0).getStringValue()) and
       call.getArgument(1).analyze().getAValue() instanceof AbstractFunction
@@ -43,25 +42,20 @@ class BDDTest extends Test, @callexpr {
  * A xUnit.js fact, that is, a function annotated with an xUnit.js
  * `Fact` annotation.
  */
-class XUnitTest extends Test, XUnitFact {
-}
+class XUnitTest extends Test, XUnitFact { }
 
 /**
  * A tape test, that is, an invocation of `require('tape').test`.
  */
 class TapeTest extends Test, @callexpr {
-  TapeTest() {
-    this = DataFlow::moduleMember("tape", "test").getACall().asExpr()
-  }
+  TapeTest() { this = DataFlow::moduleMember("tape", "test").getACall().asExpr() }
 }
 
 /**
  * An AVA test, that is, an invocation of `require('ava').test`.
  */
 class AvaTest extends Test, @callexpr {
-  AvaTest() {
-    this = DataFlow::moduleMember("ava", "test").getACall().asExpr()
-  }
+  AvaTest() { this = DataFlow::moduleMember("ava", "test").getACall().asExpr() }
 }
 
 /**
diff --git a/javascript/ql/src/semmle/javascript/frameworks/TestingCustomizations.qll b/javascript/ql/src/semmle/javascript/frameworks/TestingCustomizations.qll
index 060ed9c83832..8b137891791f 100644
--- a/javascript/ql/src/semmle/javascript/frameworks/TestingCustomizations.qll
+++ b/javascript/ql/src/semmle/javascript/frameworks/TestingCustomizations.qll
@@ -1,2 +1 @@
-/** Provides a place for customizations to the `Testing` library. */
 
diff --git a/javascript/ql/src/semmle/javascript/frameworks/UriLibraries.qll b/javascript/ql/src/semmle/javascript/frameworks/UriLibraries.qll
index 0399fc6d8742..2fa3d2e03dc9 100644
--- a/javascript/ql/src/semmle/javascript/frameworks/UriLibraries.qll
+++ b/javascript/ql/src/semmle/javascript/frameworks/UriLibraries.qll
@@ -7,13 +7,12 @@ import javascript
 /**
  * A taint propagating data flow edge arising from an operation in a URI library.
  */
-abstract class UriLibraryStep extends DataFlow::ValueNode, TaintTracking::AdditionalTaintStep {}
+abstract class UriLibraryStep extends DataFlow::ValueNode, TaintTracking::AdditionalTaintStep { }
 
 /**
  * Provides classes for working with [urijs](http://medialize.github.io/URI.js/) code.
  */
 module urijs {
-
   /**
    * Gets a data flow source node for the urijs library.
    */
@@ -26,9 +25,7 @@ module urijs {
   /**
    * Gets a data flow source node for an invocation of the urijs function.
    */
-  private DataFlow::InvokeNode invocation() {
-    result = urijs().getAnInvocation()
-  }
+  private DataFlow::InvokeNode invocation() { result = urijs().getAnInvocation() }
 
   /**
    * Gets a data flow source node for a urijs instance.
@@ -60,45 +57,36 @@ module urijs {
    * A taint step in the urijs library.
    */
   private class Step extends UriLibraryStep {
-
     DataFlow::Node src;
 
     Step() {
       // flow through "constructors" (`new` is optional)
-      exists (DataFlow::InvokeNode invk | invk = this and invk = invocation() |
+      exists(DataFlow::InvokeNode invk | invk = this and invk = invocation() |
         src = invk.getAnArgument()
       )
       or
       // flow through chained calls
-      exists (DataFlow::MethodCallNode mc | mc = this and this = chainCall() |
+      exists(DataFlow::MethodCallNode mc | mc = this and this = chainCall() |
         src = mc.getReceiver() or
         src = mc.getAnArgument()
       )
       or
       // flow through getter calls
-      exists (DataFlow::MethodCallNode mc | mc = this and this = getter() |
-        src = mc.getReceiver()
-      )
+      exists(DataFlow::MethodCallNode mc | mc = this and this = getter() | src = mc.getReceiver())
     }
 
-    override predicate step(DataFlow::Node pred, DataFlow::Node succ) {
-      pred = src and succ = this
-    }
+    override predicate step(DataFlow::Node pred, DataFlow::Node succ) { pred = src and succ = this }
   }
-
 }
 
 /**
  * Provides classes for working with [uri-js](https://github.com/garycourt/uri-js) code.
  */
 module uridashjs {
-
   /**
    * Gets a data flow source node for the uridashjs library.
    */
-  deprecated DataFlow::SourceNode uridashjs() {
-    result = DataFlow::moduleImport("uri-js")
-  }
+  deprecated DataFlow::SourceNode uridashjs() { result = DataFlow::moduleImport("uri-js") }
 
   /**
    * Gets a data flow source node for member `name` of the uridashjs library.
@@ -111,38 +99,32 @@ module uridashjs {
    * A taint step in the urijs library.
    */
   private class Step extends UriLibraryStep, DataFlow::CallNode {
-
     DataFlow::Node src;
 
     Step() {
-      exists (string name |
+      exists(string name |
         name = "parse" or
         name = "serialize" or
         name = "resolve" or
-        name = "normalize" |
+        name = "normalize"
+      |
         this = uridashjsMember(name).getACall() and
         src = getAnArgument()
       )
     }
 
-    override predicate step(DataFlow::Node pred, DataFlow::Node succ) {
-      pred = src and succ = this
-    }
+    override predicate step(DataFlow::Node pred, DataFlow::Node succ) { pred = src and succ = this }
   }
-
 }
 
 /**
  * Provides classes for working with [punycode](https://github.com/bestiejs/punycode.js) code.
  */
 module punycode {
-
   /**
    * Gets a data flow source node for the punycode library.
    */
-  deprecated DataFlow::SourceNode punycode() {
-    result = DataFlow::moduleImport("punycode")
-  }
+  deprecated DataFlow::SourceNode punycode() { result = DataFlow::moduleImport("punycode") }
 
   /**
    * Gets a data flow source node for member `name` of the punycode library.
@@ -155,51 +137,42 @@ module punycode {
    * A taint step in the punycode library.
    */
   private class Step extends UriLibraryStep, DataFlow::CallNode {
-
     DataFlow::Node src;
 
     Step() {
-      exists (string name |
+      exists(string name |
         name = "decode" or
         name = "encode" or
         name = "toUnicode" or
-        name = "toASCII" |
+        name = "toASCII"
+      |
         this = punycodeMember(name).getACall() and
         src = getAnArgument()
       )
     }
 
-    override predicate step(DataFlow::Node pred, DataFlow::Node succ) {
-      pred = src and succ = this
-    }
+    override predicate step(DataFlow::Node pred, DataFlow::Node succ) { pred = src and succ = this }
   }
-
 }
 
 /**
  * Provides classes for working with [url-parse](https://github.com/unshiftio/url-parse) code.
  */
 module urlParse {
-
   /**
    * Gets a data flow source node for the url-parse library.
    */
-  DataFlow::SourceNode urlParse() {
-    result = DataFlow::moduleImport("url-parse")
-  }
+  DataFlow::SourceNode urlParse() { result = DataFlow::moduleImport("url-parse") }
 
   /**
    * Gets a data flow source node for a call of the url-parse function.
    */
-  private DataFlow::InvokeNode call() {
-    result = urlParse().getACall()
-  }
+  private DataFlow::InvokeNode call() { result = urlParse().getACall() }
 
   /**
    * A taint step in the url-parse library.
    */
   private class Step extends UriLibraryStep, DataFlow::CallNode {
-
     DataFlow::Node src;
 
     Step() {
@@ -207,26 +180,23 @@ module urlParse {
       this = call() and
       src = getAnArgument()
       or
-      exists (DataFlow::MethodCallNode mc | this = mc and mc = call().getAMethodCall("set") |
+      exists(DataFlow::MethodCallNode mc | this = mc and mc = call().getAMethodCall("set") |
         // src = parse(...); src.set(x, y)
-        src = mc.getReceiver() or
+        src = mc.getReceiver()
+        or
         // parse(x).set(y, src)
         src = mc.getArgument(1)
       )
     }
 
-    override predicate step(DataFlow::Node pred, DataFlow::Node succ) {
-      pred = src and succ = this
-    }
+    override predicate step(DataFlow::Node pred, DataFlow::Node succ) { pred = src and succ = this }
   }
-
 }
 
 /**
  * Provides classes for working with [querystringify](https://github.com/unshiftio/querystringify) code.
  */
 module querystringify {
-
   /**
    * Gets a data flow source node for the querystringify library.
    */
@@ -245,30 +215,26 @@ module querystringify {
    * A taint step in the querystringify library.
    */
   private class Step extends UriLibraryStep, DataFlow::CallNode {
-
     DataFlow::Node src;
 
     Step() {
-      exists (string name |
+      exists(string name |
         name = "parse" or
-        name = "stringify" |
+        name = "stringify"
+      |
         this = querystringifyMember(name).getACall() and
         src = getAnArgument()
       )
     }
 
-    override predicate step(DataFlow::Node pred, DataFlow::Node succ) {
-      pred = src and succ = this
-    }
+    override predicate step(DataFlow::Node pred, DataFlow::Node succ) { pred = src and succ = this }
   }
-
 }
 
 /**
  * Provides classes for working with [query-string](https://github.com/sindresorhus/query-string) code.
  */
 module querydashstring {
-
   /**
    * Gets a data flow source node for the query-string library.
    */
@@ -276,7 +242,6 @@ module querydashstring {
     result = DataFlow::moduleImport("query-string")
   }
 
-
   /**
    * Gets a data flow source node for member `name` of the query-string library.
    */
@@ -288,82 +253,67 @@ module querydashstring {
    * A taint step in the query-string library.
    */
   private class Step extends UriLibraryStep, DataFlow::CallNode {
-
     DataFlow::Node src;
 
     Step() {
-      exists (string name |
+      exists(string name |
         name = "parse" or
         name = "extract" or
         name = "parseUrl" or
-        name = "stringify" |
+        name = "stringify"
+      |
         this = querydashstringMember(name).getACall() and
         src = getAnArgument()
       )
     }
 
-    override predicate step(DataFlow::Node pred, DataFlow::Node succ) {
-      pred = src and succ = this
-    }
+    override predicate step(DataFlow::Node pred, DataFlow::Node succ) { pred = src and succ = this }
   }
-
 }
 
 /**
  * Provides classes for working with [url](https://nodejs.org/api/url.html) code.
  */
 module url {
-
   /**
    * Gets a data flow source node for the url library.
    */
-  deprecated DataFlow::SourceNode url() {
-    result = DataFlow::moduleImport("url")
-  }
-
+  deprecated DataFlow::SourceNode url() { result = DataFlow::moduleImport("url") }
 
   /**
    * Gets a data flow source node for member `name` of the url library.
    */
-  DataFlow::SourceNode urlMember(string name) {
-    result = DataFlow::moduleMember("url", name)
-  }
+  DataFlow::SourceNode urlMember(string name) { result = DataFlow::moduleMember("url", name) }
 
   /**
    * A taint step in the url library.
    */
   private class Step extends UriLibraryStep, DataFlow::CallNode {
-
     DataFlow::Node src;
 
     Step() {
-      exists (string name |
+      exists(string name |
         name = "parse" or
         name = "format" or
-        name = "resolve" |
+        name = "resolve"
+      |
         this = urlMember(name).getACall() and
         src = getAnArgument()
       )
     }
 
-    override predicate step(DataFlow::Node pred, DataFlow::Node succ) {
-      pred = src and succ = this
-    }
+    override predicate step(DataFlow::Node pred, DataFlow::Node succ) { pred = src and succ = this }
   }
-
 }
 
 /**
  * Provides classes for working with [querystring](https://nodejs.org/api/querystring.html) code.
  */
 module querystring {
-
   /**
    * Gets a data flow source node for the querystring library.
    */
-  deprecated DataFlow::SourceNode querystring() {
-    result = DataFlow::moduleImport("querystring")
-  }
+  deprecated DataFlow::SourceNode querystring() { result = DataFlow::moduleImport("querystring") }
 
   /**
    * Gets a data flow source node for member `name` of the querystring library.
@@ -376,23 +326,20 @@ module querystring {
    * A taint step in the querystring library.
    */
   private class Step extends UriLibraryStep, DataFlow::CallNode {
-
     DataFlow::Node src;
 
     Step() {
-      exists (string name |
+      exists(string name |
         name = "escape" or
         name = "unescape" or
         name = "parse" or
-        name = "stringify" |
+        name = "stringify"
+      |
         this = querystringMember(name).getACall() and
         src = getAnArgument()
       )
     }
 
-    override predicate step(DataFlow::Node pred, DataFlow::Node succ) {
-      pred = src and succ = this
-    }
+    override predicate step(DataFlow::Node pred, DataFlow::Node succ) { pred = src and succ = this }
   }
-
 }
diff --git a/javascript/ql/src/semmle/javascript/frameworks/XmlParsers.qll b/javascript/ql/src/semmle/javascript/frameworks/XmlParsers.qll
index 3137a29bdf4f..060fa62ee765 100644
--- a/javascript/ql/src/semmle/javascript/frameworks/XmlParsers.qll
+++ b/javascript/ql/src/semmle/javascript/frameworks/XmlParsers.qll
@@ -10,11 +10,9 @@ module XML {
    */
   newtype EntityKind =
     /** Internal general entity. */
-    InternalEntity()
-    or
+    InternalEntity() or
     /** External general entity, either parsed or unparsed. */
-    ExternalEntity(boolean parsed) { parsed = true or parsed = false }
-    or
+    ExternalEntity(boolean parsed) { parsed = true or parsed = false } or
     /** Parameter entity, either internal or external. */
     ParameterEntity(boolean external) { external = true or external = false }
 
@@ -34,22 +32,20 @@ module XML {
    */
   class LibXmlJsParserInvocation extends ParserInvocation {
     LibXmlJsParserInvocation() {
-      exists (string m |
+      exists(string m |
         this = js::DataFlow::moduleMember("libxmljs", m).getACall().asExpr() and
         m.matches("parseXml%")
       )
     }
 
-    override js::Expr getSourceArgument() {
-      result = getArgument(0)
-    }
+    override js::Expr getSourceArgument() { result = getArgument(0) }
 
     override predicate resolvesEntities(EntityKind kind) {
       // internal entities are always resolved
       kind = InternalEntity()
       or
       // other entities are only resolved if the configuration option `noent` is set to `true`
-      exists (js::Expr noent |
+      exists(js::Expr noent |
         hasOptionArgument(1, "noent", noent) and
         noent.mayHaveBooleanValue(true)
       )
@@ -60,7 +56,7 @@ module XML {
    * Gets a call to method `methodName` on an instance of class `className` from module `modName`.
    */
   private js::MethodCallExpr moduleMethodCall(string modName, string className, string methodName) {
-    exists (js::DataFlow::ModuleImportNode mod |
+    exists(js::DataFlow::ModuleImportNode mod |
       mod.getPath() = modName and
       result = mod.getAConstructorInvocation(className).getAMethodCall(methodName).asExpr()
     )
@@ -74,9 +70,7 @@ module XML {
       this = moduleMethodCall("libxmljs", "SaxParser", "parseString")
     }
 
-    override js::Expr getSourceArgument() {
-      result = getArgument(0)
-    }
+    override js::Expr getSourceArgument() { result = getArgument(0) }
 
     override predicate resolvesEntities(EntityKind kind) {
       // entities are resolved by default
@@ -92,9 +86,7 @@ module XML {
       this = moduleMethodCall("libxmljs", "SaxPushParser", "push")
     }
 
-    override js::Expr getSourceArgument() {
-      result = getArgument(0)
-    }
+    override js::Expr getSourceArgument() { result = getArgument(0) }
 
     override predicate resolvesEntities(EntityKind kind) {
       // entities are resolved by default
@@ -107,14 +99,12 @@ module XML {
    */
   class ExpatParserInvocation extends ParserInvocation {
     ExpatParserInvocation() {
-      exists (string m | m = "parse" or m = "write" |
+      exists(string m | m = "parse" or m = "write" |
         this = moduleMethodCall("node-expat", "Parser", m)
       )
     }
 
-    override js::Expr getSourceArgument() {
-      result = getArgument(0)
-    }
+    override js::Expr getSourceArgument() { result = getArgument(0) }
 
     override predicate resolvesEntities(EntityKind kind) {
       // only internal entities are resolved by default
@@ -127,7 +117,7 @@ module XML {
    */
   private class DOMParserXmlParserInvocation extends XML::ParserInvocation {
     DOMParserXmlParserInvocation() {
-      exists (js::DataFlow::GlobalVarRefNode domparser |
+      exists(js::DataFlow::GlobalVarRefNode domparser |
         domparser.getName() = "DOMParser" and
         this = domparser.getAnInstantiation().getAMethodCall("parseFromString").asExpr() and
         // type contains the string `xml`, that is, it's not `text/html`
@@ -135,13 +125,9 @@ module XML {
       )
     }
 
-    override js::Expr getSourceArgument() {
-      result = getArgument(0)
-    }
+    override js::Expr getSourceArgument() { result = getArgument(0) }
 
-    override predicate resolvesEntities(XML::EntityKind kind) {
-      kind = InternalEntity()
-    }
+    override predicate resolvesEntities(XML::EntityKind kind) { kind = InternalEntity() }
   }
 
   /**
@@ -149,7 +135,7 @@ module XML {
    */
   private class IELegacyXmlParserInvocation extends XML::ParserInvocation {
     IELegacyXmlParserInvocation() {
-      exists (js::DataFlow::NewNode activeXObject, string activeXType |
+      exists(js::DataFlow::NewNode activeXObject, string activeXType |
         activeXObject = js::DataFlow::globalVarRef("ActiveXObject").getAnInstantiation() and
         activeXObject.getArgument(0).asExpr().mayHaveStringValue(activeXType) and
         activeXType.regexpMatch("Microsoft\\.XMLDOM|Msxml.*\\.DOMDocument.*") and
@@ -157,13 +143,9 @@ module XML {
       )
     }
 
-    override js::Expr getSourceArgument() {
-      result = getArgument(0)
-    }
+    override js::Expr getSourceArgument() { result = getArgument(0) }
 
-    override predicate resolvesEntities(XML::EntityKind kind) {
-      any()
-    }
+    override predicate resolvesEntities(XML::EntityKind kind) { any() }
   }
 
   /**
@@ -174,12 +156,8 @@ module XML {
       this.getCallee().(js::PropAccess).getQualifiedName() = "goog.dom.xml.loadXml"
     }
 
-    override js::Expr getSourceArgument() {
-      result = getArgument(0)
-    }
+    override js::Expr getSourceArgument() { result = getArgument(0) }
 
-    override predicate resolvesEntities(XML::EntityKind kind) {
-      kind = InternalEntity()
-    }
+    override predicate resolvesEntities(XML::EntityKind kind) { kind = InternalEntity() }
   }
 }
diff --git a/javascript/ql/src/semmle/javascript/frameworks/jQuery.qll b/javascript/ql/src/semmle/javascript/frameworks/jQuery.qll
index 92906282d0dc..e2f1d44f607c 100644
--- a/javascript/ql/src/semmle/javascript/frameworks/jQuery.qll
+++ b/javascript/ql/src/semmle/javascript/frameworks/jQuery.qll
@@ -21,16 +21,14 @@ DataFlow::SourceNode jquery() {
  * Note that this class is an over-approximation: `nd instanceof JQueryObject`
  * may hold for nodes `nd` that cannot, in fact, refer to a jQuery object.
  */
-abstract class JQueryObject extends Expr {
-
-}
+abstract class JQueryObject extends Expr { }
 
 /**
  * A jQuery object created from a jQuery method.
  */
 private class OrdinaryJQueryObject extends JQueryObject {
   OrdinaryJQueryObject() {
-    exists (JQueryMethodCall jq |
+    exists(JQueryMethodCall jq |
       this.flow().getALocalSource().asExpr() = jq and
       // `jQuery.val()` does _not_ return a jQuery object
       jq.getMethodName() != "val"
@@ -48,7 +46,8 @@ class JQueryMethodCall extends CallExpr {
     this = jquery().getACall().asExpr() and name = "$"
     or
     // initial call
-    this = jquery().getAMemberCall(name).asExpr() or
+    this = jquery().getAMemberCall(name).asExpr()
+    or
     // chained call
     this.(MethodCallExpr).calls(any(JQueryObject jq), name)
   }
@@ -56,17 +55,14 @@ class JQueryMethodCall extends CallExpr {
   /**
    * Gets the name of the jQuery method this call invokes.
    */
-  string getMethodName() {
-    result = name
-  }
+  string getMethodName() { result = name }
 
   /**
    * DEPRECATED: Use `interpretsArgumentAsHtml` instead.
    *
    * Holds if this call interprets its arguments as HTML.
    */
-  deprecated
-  predicate interpretsArgumentsAsHtml() {
+  deprecated predicate interpretsArgumentsAsHtml() {
     name = "addClass" or
     name = "after" or
     name = "append" or
@@ -95,19 +91,19 @@ class JQueryMethodCall extends CallExpr {
   predicate interpretsArgumentAsHtml(Expr e) {
     // some methods interpret all their arguments as (potential) HTML
     (
-     name = "after" or
-     name = "append" or
-     name = "appendTo" or
-     name = "before" or
-     name = "html" or
-     name = "insertAfter" or
-     name = "insertBefore" or
-     name = "prepend" or
-     name = "prependTo" or
-     name = "replaceWith" or
-     name = "wrap" or
-     name = "wrapAll" or
-     name = "wrapInner"
+      name = "after" or
+      name = "append" or
+      name = "appendTo" or
+      name = "before" or
+      name = "html" or
+      name = "insertAfter" or
+      name = "insertBefore" or
+      name = "prepend" or
+      name = "prependTo" or
+      name = "replaceWith" or
+      name = "wrap" or
+      name = "wrapAll" or
+      name = "wrapInner"
     ) and
     e = getAnArgument()
     or
@@ -126,13 +122,13 @@ class JQueryMethodCall extends CallExpr {
   predicate interpretsArgumentAsSelector(Expr e) {
     // some methods interpret all their arguments as (potential) selectors
     (
-     name = "appendTo" or
-     name = "insertAfter" or
-     name = "insertBefore" or
-     name = "prependTo" or
-     name = "wrap" or
-     name = "wrapAll" or
-     name = "wrapInner"
+      name = "appendTo" or
+      name = "insertAfter" or
+      name = "insertBefore" or
+      name = "prependTo" or
+      name = "wrap" or
+      name = "wrapAll" or
+      name = "wrapInner"
     ) and
     e = getAnArgument()
     or
@@ -146,17 +142,11 @@ class JQueryMethodCall extends CallExpr {
  * A call to `jQuery.parseXML`.
  */
 private class JQueryParseXmlCall extends XML::ParserInvocation {
-  JQueryParseXmlCall() {
-    this.(JQueryMethodCall).getMethodName() = "parseXML"
-  }
+  JQueryParseXmlCall() { this.(JQueryMethodCall).getMethodName() = "parseXML" }
 
-  override Expr getSourceArgument() {
-    result = getArgument(0)
-  }
+  override Expr getSourceArgument() { result = getArgument(0) }
 
-  override predicate resolvesEntities(XML::EntityKind kind) {
-    kind = XML::InternalEntity()
-  }
+  override predicate resolvesEntities(XML::EntityKind kind) { kind = XML::InternalEntity() }
 }
 
 /**
@@ -164,21 +154,20 @@ private class JQueryParseXmlCall extends XML::ParserInvocation {
  */
 private class JQueryDomElementDefinition extends DOM::ElementDefinition, @callexpr {
   string tagName;
+
   CallExpr call;
 
   JQueryDomElementDefinition() {
     this = call and
     call = jquery().getACall().asExpr() and
-    exists (string s | s = call.getArgument(0).(Expr).getStringValue() |
+    exists(string s | s = call.getArgument(0).(Expr).getStringValue() |
       // match an opening angle bracket followed by a tag name, followed by arbitrary
       // text and a closing angle bracket, potentially with whitespace in between
       tagName = s.regexpCapture("\\s*<\\s*(\\w+)\\b[^>]*>\\s*", 1).toLowerCase()
     )
   }
 
-  override string getName() {
-    result = tagName
-  }
+  override string getName() { result = tagName }
 
   /**
    * Gets a data flow node specifying the attributes of the constructed DOM element.
@@ -186,9 +175,7 @@ private class JQueryDomElementDefinition extends DOM::ElementDefinition, @callex
    * For example, in `$("<a/>", { href: "https://semmle.com" })` the second argument
    * specifies the attributes of the new `<a>` element.
    */
-  DataFlow::SourceNode getAttributes() {
-    result.flowsToExpr(call.getArgument(1))
-  }
+  DataFlow::SourceNode getAttributes() { result.flowsToExpr(call.getArgument(1)) }
 
   override DOM::ElementDefinition getParent() { none() }
 }
@@ -196,8 +183,7 @@ private class JQueryDomElementDefinition extends DOM::ElementDefinition, @callex
 /**
  * An attribute defined using jQuery APIs.
  */
-private abstract class JQueryAttributeDefinition extends DOM::AttributeDefinition {
-}
+abstract private class JQueryAttributeDefinition extends DOM::AttributeDefinition { }
 
 /**
  * An attribute definition supplied when constructing a DOM element using `$(...)`.
@@ -207,6 +193,7 @@ private abstract class JQueryAttributeDefinition extends DOM::AttributeDefinitio
  */
 private class JQueryAttributeDefinitionInElement extends JQueryAttributeDefinition {
   JQueryDomElementDefinition elt;
+
   DataFlow::PropWrite pwn;
 
   JQueryAttributeDefinitionInElement() {
@@ -214,17 +201,11 @@ private class JQueryAttributeDefinitionInElement extends JQueryAttributeDefiniti
     elt.getAttributes().flowsTo(pwn.getBase())
   }
 
-  override string getName() {
-    result = pwn.getPropertyName()
-  }
+  override string getName() { result = pwn.getPropertyName() }
 
-  override DataFlow::Node getValueNode() {
-    result = pwn.getRhs()
-  }
+  override DataFlow::Node getValueNode() { result = pwn.getRhs() }
 
-  override DOM::ElementDefinition getElement() {
-    result = elt
-  }
+  override DOM::ElementDefinition getElement() { result = elt }
 }
 
 /**
@@ -235,31 +216,28 @@ private class JQueryAttr2Call extends JQueryAttributeDefinition, @callexpr {
   JQueryDomElementDefinition elt;
 
   JQueryAttr2Call() {
-    exists (MethodCallExpr mce | this = mce |
+    exists(MethodCallExpr mce | this = mce |
       mce.getReceiver().(DOM::Element).getDefinition() = elt and
       (mce.getMethodName() = "attr" or mce.getMethodName() = "prop") and
       mce.getNumArgument() = 2
     )
   }
 
-  override string getName() {
-    result = this.(CallExpr).getArgument(0).getStringValue()
-  }
+  override string getName() { result = this.(CallExpr).getArgument(0).getStringValue() }
 
   override DataFlow::Node getValueNode() {
     result = DataFlow::valueNode(this.(CallExpr).getArgument(1))
   }
 
-  override DOM::ElementDefinition getElement() {
-    result = elt
-  }
+  override DOM::ElementDefinition getElement() { result = elt }
 }
 
 /**
  * Holds if `mce` is a call to `elt.attr(attributes)` or `elt.prop(attributes)`.
  */
-private predicate bulkAttributeInit(MethodCallExpr mce, JQueryDomElementDefinition elt,
-                                    DataFlow::SourceNode attributes) {
+private predicate bulkAttributeInit(
+  MethodCallExpr mce, JQueryDomElementDefinition elt, DataFlow::SourceNode attributes
+) {
   mce.getReceiver().(DOM::Element).getDefinition() = elt and
   (mce.getMethodName() = "attr" or mce.getMethodName() = "prop") and
   mce.getNumArgument() = 1 and
@@ -273,26 +251,21 @@ private predicate bulkAttributeInit(MethodCallExpr mce, JQueryDomElementDefiniti
  */
 private class JQueryAttrCall extends JQueryAttributeDefinition, @callexpr {
   JQueryDomElementDefinition elt;
+
   DataFlow::PropWrite pwn;
 
   JQueryAttrCall() {
-    exists (DataFlow::SourceNode attributes |
+    exists(DataFlow::SourceNode attributes |
       bulkAttributeInit(this, elt, attributes) and
       attributes.flowsTo(pwn.getBase())
     )
   }
 
-  override string getName() {
-    result = pwn.getPropertyName()
-  }
+  override string getName() { result = pwn.getPropertyName() }
 
-  override DataFlow::Node getValueNode() {
-    result = pwn.getRhs()
-  }
+  override DataFlow::Node getValueNode() { result = pwn.getRhs() }
 
-  override DOM::ElementDefinition getElement() {
-    result = elt
-  }
+  override DOM::ElementDefinition getElement() { result = elt }
 }
 
 /**
@@ -303,24 +276,20 @@ private class JQueryAttr3Call extends JQueryAttributeDefinition, @callexpr {
   DOM::ElementDefinition elt;
 
   JQueryAttr3Call() {
-    exists (MethodCallExpr mce | this = mce |
+    exists(MethodCallExpr mce | this = mce |
       mce = jquery().getAMemberCall(any(string m | m = "attr" or m = "prop")).asExpr() and
       mce.getArgument(0).(DOM::Element).getDefinition() = elt and
       mce.getNumArgument() = 3
     )
   }
 
-  override string getName() {
-    result = this.(CallExpr).getArgument(1).getStringValue()
-  }
+  override string getName() { result = this.(CallExpr).getArgument(1).getStringValue() }
 
   override DataFlow::Node getValueNode() {
     result = DataFlow::valueNode(this.(CallExpr).getArgument(2))
   }
 
-  override DOM::ElementDefinition getElement() {
-    result = elt
-  }
+  override DOM::ElementDefinition getElement() { result = elt }
 }
 
 /**
@@ -333,7 +302,7 @@ private class JQueryChainedElement extends DOM::Element {
   DOM::Element inner;
 
   JQueryChainedElement() {
-    exists (JQueryMethodCall jqmc | this = jqmc |
+    exists(JQueryMethodCall jqmc | this = jqmc |
       jqmc.(MethodCallExpr).getReceiver() = inner and
       this instanceof JQueryObject and
       defn = inner.getDefinition()
@@ -349,7 +318,7 @@ private class JQueryClientRequest extends CustomClientRequest {
     exists(string name |
       name = "ajax" or
       name = "getJSON"
-      |
+    |
       this = jquery().getAMemberCall(name)
     )
   }
diff --git a/javascript/ql/src/semmle/javascript/frameworks/xUnit.qll b/javascript/ql/src/semmle/javascript/frameworks/xUnit.qll
index de0d1faed9d4..1917aa8ee50c 100644
--- a/javascript/ql/src/semmle/javascript/frameworks/xUnit.qll
+++ b/javascript/ql/src/semmle/javascript/frameworks/xUnit.qll
@@ -7,7 +7,7 @@ import javascript
 /** Holds if an initialization of xUnit.js is detected. */
 private predicate xUnitDetected() {
   // look for `Function.RegisterNamespace("xUnit.js");`
-  exists (MethodCallExpr mc |
+  exists(MethodCallExpr mc |
     mc.getParent() instanceof ExprStmt and
     mc = DataFlow::globalVarRef("Function").getAMemberCall("RegisterNamespace").asExpr() and
     mc.getNumArgument() = 1 and
@@ -17,7 +17,7 @@ private predicate xUnitDetected() {
 
 /** Holds if `e` looks like an xUnit.js attribute, possibly with arguments. */
 private predicate possiblyAttribute(Expr e, string name) {
-  exists (Identifier id | id = e or id = e.(CallExpr).getCallee() |
+  exists(Identifier id | id = e or id = e.(CallExpr).getCallee() |
     name = id.getName() and
     name.regexpMatch("Async|Data|Fact|Fixture|Import|ImportJson|Skip|Trait")
   )
@@ -42,9 +42,9 @@ abstract private class BracketedListOfExpressions extends Expr {
 /**
  * An array expression viewed as a bracketed list of expressions.
  */
-private class ArrayExprIsABracketedListOfExpressions extends
-    ArrayExpr, BracketedListOfExpressions {
+private class ArrayExprIsABracketedListOfExpressions extends ArrayExpr, BracketedListOfExpressions {
   override predicate isImpure() { ArrayExpr.super.isImpure() }
+
   /** Gets the `i`th element of this array literal. */
   override Expr getElement(int i) { result = ArrayExpr.super.getElement(i) }
 }
@@ -59,7 +59,7 @@ private class ArrayExprIsABracketedListOfExpressions extends
  */
 private class IndexExprIndexIsBracketedListOfExpressions extends BracketedListOfExpressions {
   IndexExprIndexIsBracketedListOfExpressions() {
-    exists (IndexExpr idx, Expr base |
+    exists(IndexExpr idx, Expr base |
       base = idx.getBase() and
       this = idx.getIndex() and
       // restrict to case where previous expression is also bracketed
@@ -68,8 +68,9 @@ private class IndexExprIndexIsBracketedListOfExpressions extends BracketedListOf
   }
 
   override Expr getElement(int i) {
-    result = this.(SeqExpr).getChildExpr(i) or
-    not this instanceof SeqExpr and i  = 0 and result = this
+    result = this.(SeqExpr).getChildExpr(i)
+    or
+    not this instanceof SeqExpr and i = 0 and result = this
   }
 
   override Token getFirstToken() {
@@ -92,13 +93,12 @@ private class IndexExprIndexIsBracketedListOfExpressions extends BracketedListOf
  */
 private predicate annotationTarget(BracketedListOfExpressions ann, XUnitTarget trg) {
   // every element looks like an attribute
-  forex (Expr e | e = ann.getElement(_) | possiblyAttribute(e, _)) and
+  forex(Expr e | e = ann.getElement(_) | possiblyAttribute(e, _)) and
   // followed directly either by a target or by another annotation
-  exists (Token next | next = ann.getLastToken().getNextToken() |
+  exists(Token next | next = ann.getLastToken().getNextToken() |
     trg.getFirstToken() = next
     or
-    exists (BracketedListOfExpressions ann2 |
-      ann2.getFirstToken() = next |
+    exists(BracketedListOfExpressions ann2 | ann2.getFirstToken() = next |
       annotationTarget(ann2, trg)
     )
   )
@@ -115,24 +115,16 @@ class XUnitAnnotation extends Expr {
   }
 
   /** Gets the declaration or definition to which this annotation belongs. */
-  XUnitTarget getTarget() {
-    annotationTarget(this, result)
-  }
+  XUnitTarget getTarget() { annotationTarget(this, result) }
 
   /** Gets the `i`th attribute of this annotation. */
-  Expr getAttribute(int i) {
-    result = this.(BracketedListOfExpressions).getElement(i)
-  }
+  Expr getAttribute(int i) { result = this.(BracketedListOfExpressions).getElement(i) }
 
   /** Gets an attribute of this annotation. */
-  Expr getAnAttribute() {
-    result = getAttribute(_)
-  }
+  Expr getAnAttribute() { result = getAttribute(_) }
 
   /** Gets the number of attributes of this annotation. */
-  int getNumAttribute() {
-    result = strictcount(getAnAttribute())
-  }
+  int getNumAttribute() { result = strictcount(getAnAttribute()) }
 
   /**
    * Holds if this element is at the specified location.
@@ -141,11 +133,14 @@ class XUnitAnnotation extends Expr {
    * For more information, see
    * [LGTM locations](https://lgtm.com/help/ql/locations).
    */
-  predicate hasLocationInfo(string filepath, int startline, int startcolumn, int endline, int endcolumn) {
+  predicate hasLocationInfo(
+    string filepath, int startline, int startcolumn, int endline, int endcolumn
+  ) {
     // extend location to cover brackets
-    exists (Location l1, Location l2 |
+    exists(Location l1, Location l2 |
       l1 = getFirstToken().getLocation() and
-      l2 = getLastToken().getLocation() |
+      l2 = getLastToken().getLocation()
+    |
       filepath = l1.getFile().getAbsolutePath() and
       startline = l1.getStartLine() and
       startcolumn = l1.getStartColumn() and
@@ -167,38 +162,26 @@ class XUnitTarget extends Stmt {
   }
 
   /** Gets an annotation of which this is the target, if any. */
-  XUnitAnnotation getAnAnnotation() {
-    this = result.getTarget()
-  }
+  XUnitAnnotation getAnAnnotation() { this = result.getTarget() }
 }
 
 /**
  * An xUnit.js attribute appearing in an annotation.
  */
 class XUnitAttribute extends Expr {
-  XUnitAttribute() {
-    exists (XUnitAnnotation ann | this = ann.getAnAttribute())
-  }
+  XUnitAttribute() { exists(XUnitAnnotation ann | this = ann.getAnAttribute()) }
 
   /** Gets the name of this attribute. */
-  string getName() {
-    possiblyAttribute(this, result)
-  }
+  string getName() { possiblyAttribute(this, result) }
 
   /** Gets the `i`th parameter of this attribute. */
-  Expr getParameter(int i) {
-    result = this.(CallExpr).getArgument(i)
-  }
+  Expr getParameter(int i) { result = this.(CallExpr).getArgument(i) }
 
   /** Gets a parameter of this attribute. */
-  Expr getAParameter() {
-    result = getParameter(_)
-  }
+  Expr getAParameter() { result = getParameter(_) }
 
   /** Gets the number of parameters of this attribute. */
-  int getNumParameter() {
-    result = count(getAParameter())
-  }
+  int getNumParameter() { result = count(getAParameter()) }
 }
 
 /**
@@ -206,7 +189,7 @@ class XUnitAttribute extends Expr {
  */
 private class XUnitAnnotatedFunction extends Function {
   XUnitAnnotatedFunction() {
-    exists (XUnitTarget target | exists(target.getAnAnnotation()) |
+    exists(XUnitTarget target | exists(target.getAnAnnotation()) |
       this = target or
       this = target.(VarDeclStmt).getADecl().getInit() or
       this = target.(ExprStmt).getExpr().(AssignExpr).getRhs()
@@ -224,34 +207,26 @@ private class XUnitAnnotatedFunction extends Function {
  * An xUnit.js `Fixture` annotation.
  */
 class XUnitFixtureAnnotation extends XUnitAnnotation {
-  XUnitFixtureAnnotation() {
-    getAnAttribute().accessesGlobal("Fixture")
-  }
+  XUnitFixtureAnnotation() { getAnAttribute().accessesGlobal("Fixture") }
 }
 
 /**
  * An xUnit.js fixture.
  */
 class XUnitFixture extends XUnitAnnotatedFunction {
-  XUnitFixture() {
-    getAnAnnotation() instanceof XUnitFixtureAnnotation
-  }
+  XUnitFixture() { getAnAnnotation() instanceof XUnitFixtureAnnotation }
 }
 
 /**
  * An xUnit.js `Fact` annotation.
  */
 class XUnitFactAnnotation extends XUnitAnnotation {
-  XUnitFactAnnotation() {
-    getAnAttribute().accessesGlobal("Fact")
-  }
+  XUnitFactAnnotation() { getAnAttribute().accessesGlobal("Fact") }
 }
 
 /**
  * An xUnit.js fact.
  */
 class XUnitFact extends XUnitAnnotatedFunction {
-  XUnitFact() {
-    getAnAnnotation() instanceof XUnitFactAnnotation
-  }
+  XUnitFact() { getAnAnnotation() instanceof XUnitFactAnnotation }
 }
diff --git a/javascript/ql/src/semmle/javascript/heuristics/AdditionalFrameworks.qll b/javascript/ql/src/semmle/javascript/heuristics/AdditionalFrameworks.qll
index d6513ac4da83..b02863b5a4b7 100644
--- a/javascript/ql/src/semmle/javascript/heuristics/AdditionalFrameworks.qll
+++ b/javascript/ql/src/semmle/javascript/heuristics/AdditionalFrameworks.qll
@@ -14,8 +14,7 @@ private class ImpreciseLodashMember extends LodashUnderscore::Member {
   string name;
 
   ImpreciseLodashMember() {
-    exists (string lodash |
-      this = DataFlow::moduleMember(lodash, name) |
+    exists(string lodash | this = DataFlow::moduleMember(lodash, name) |
       lodash.matches("%-lodash") or lodash.matches("%-underscore")
     )
   }
diff --git a/javascript/ql/src/semmle/javascript/heuristics/AdditionalPromises.qll b/javascript/ql/src/semmle/javascript/heuristics/AdditionalPromises.qll
index 93a7ebc82b72..4c12821031c4 100644
--- a/javascript/ql/src/semmle/javascript/heuristics/AdditionalPromises.qll
+++ b/javascript/ql/src/semmle/javascript/heuristics/AdditionalPromises.qll
@@ -7,9 +7,5 @@
 import javascript
 
 private class PromotedPromiseCandidate extends PromiseDefinition, PromiseCandidate {
-
-  override DataFlow::FunctionNode getExecutor()  {
-    result = getCallback(0)
-  }
-
-}
\ No newline at end of file
+  override DataFlow::FunctionNode getExecutor() { result = getCallback(0) }
+}
diff --git a/javascript/ql/src/semmle/javascript/heuristics/AdditionalRouteHandlers.qll b/javascript/ql/src/semmle/javascript/heuristics/AdditionalRouteHandlers.qll
index 9a424af719ce..aa1a3e859f5a 100644
--- a/javascript/ql/src/semmle/javascript/heuristics/AdditionalRouteHandlers.qll
+++ b/javascript/ql/src/semmle/javascript/heuristics/AdditionalRouteHandlers.qll
@@ -10,51 +10,38 @@ private import semmle.javascript.frameworks.ConnectExpressShared
 /**
  * Add `NodeJSLib::RouteHandlerCandidate` to the extent of `NodeJSLib::RouteHandler`.
  */
-private class PromotedNodeJSLibCandidate extends NodeJSLib::RouteHandler, HTTP::Servers::StandardRouteHandler {
-
-    PromotedNodeJSLibCandidate() {
-      this instanceof NodeJSLib::RouteHandlerCandidate
-    }
-
+private class PromotedNodeJSLibCandidate extends NodeJSLib::RouteHandler,
+  HTTP::Servers::StandardRouteHandler {
+  PromotedNodeJSLibCandidate() { this instanceof NodeJSLib::RouteHandlerCandidate }
 }
 
 /**
  * Add `Hapi::RouteHandlerCandidate` to the extent of `Hapi::RouteHandler`.
  */
 private class PromotedHapiCandidate extends Hapi::RouteHandler, HTTP::Servers::StandardRouteHandler {
-
-    PromotedHapiCandidate() {
-      this instanceof Hapi::RouteHandlerCandidate
-    }
-
+  PromotedHapiCandidate() { this instanceof Hapi::RouteHandlerCandidate }
 }
 
 /**
  * Add `ConnectExpressShared::RouteHandlerCandidate` to the extent of `Express::RouteHandler`.
  */
-private class PromotedExpressCandidate extends Express::RouteHandler, HTTP::Servers::StandardRouteHandler {
-
-    PromotedExpressCandidate() {
-      this instanceof ConnectExpressShared::RouteHandlerCandidate
-    }
-
-    override SimpleParameter getRouteHandlerParameter(string kind) {
-      result = ConnectExpressShared::getRouteHandlerParameter(getAstNode(), kind)
-    }
+private class PromotedExpressCandidate extends Express::RouteHandler,
+  HTTP::Servers::StandardRouteHandler {
+  PromotedExpressCandidate() { this instanceof ConnectExpressShared::RouteHandlerCandidate }
 
+  override SimpleParameter getRouteHandlerParameter(string kind) {
+    result = ConnectExpressShared::getRouteHandlerParameter(getAstNode(), kind)
+  }
 }
 
 /**
  * Add `ConnectExpressShared::RouteHandlerCandidate` to the extent of `Connect::RouteHandler`.
  */
-private class PromotedConnectCandidate extends Connect::RouteHandler, HTTP::Servers::StandardRouteHandler {
-
-    PromotedConnectCandidate() {
-      this instanceof ConnectExpressShared::RouteHandlerCandidate
-    }
+private class PromotedConnectCandidate extends Connect::RouteHandler,
+  HTTP::Servers::StandardRouteHandler {
+  PromotedConnectCandidate() { this instanceof ConnectExpressShared::RouteHandlerCandidate }
 
-    override SimpleParameter getRouteHandlerParameter(string kind) {
-      result = ConnectExpressShared::getRouteHandlerParameter(getAstNode(), kind)
-    }
-
-}
\ No newline at end of file
+  override SimpleParameter getRouteHandlerParameter(string kind) {
+    result = ConnectExpressShared::getRouteHandlerParameter(getAstNode(), kind)
+  }
+}
diff --git a/javascript/ql/src/semmle/javascript/heuristics/AdditionalSinks.qll b/javascript/ql/src/semmle/javascript/heuristics/AdditionalSinks.qll
index 32a96584e56a..e7857bd24755 100644
--- a/javascript/ql/src/semmle/javascript/heuristics/AdditionalSinks.qll
+++ b/javascript/ql/src/semmle/javascript/heuristics/AdditionalSinks.qll
@@ -25,14 +25,18 @@ abstract class HeuristicSink extends DataFlow::Node { }
 
 private class HeuristicCodeInjectionSink extends HeuristicSink, CodeInjection::Sink {
   HeuristicCodeInjectionSink() {
-    isAssignedToOrConcatenatedWith(this, "(?i)(command|cmd|exec|code|script|program)") or
-    isArgTo(this, "(?i)(eval|run)") or // "exec" clashes too often with `RegExp.prototype.exec`
-    exists (string srcPattern |
+    isAssignedToOrConcatenatedWith(this, "(?i)(command|cmd|exec|code|script|program)")
+    or
+    isArgTo(this, "(?i)(eval|run)") // "exec" clashes too often with `RegExp.prototype.exec`
+    or
+    exists(string srcPattern |
       // function/lambda syntax anywhere
       srcPattern = "(?s).*function\\s*\\(.*\\).*" or
-      srcPattern = "(?s).*(\\(.*\\)|[A-Za-z_]+)\\s?=>.*" |
+      srcPattern = "(?s).*(\\(.*\\)|[A-Za-z_]+)\\s?=>.*"
+    |
       isContatenatedWithString(this, srcPattern)
-    ) or
+    )
+    or
     // dynamic property name
     isContatenatedWithStrings("(?is)[a-z]+\\[", this, "(?s)\\].*")
   }
@@ -44,6 +48,7 @@ private class HeuristicCommandInjectionSink extends HeuristicSink, CommandInject
     isArgTo(this, "(?i)(a?sync)?(eval|run)(a?sync)?") // "exec" clashes too often with `RegExp.prototype.exec`
   }
 }
+
 private class HeuristicDomBasedXssSink extends HeuristicSink, DomBasedXss::DomBasedXss::Sink {
   HeuristicDomBasedXssSink() {
     isAssignedToOrConcatenatedWith(this, "(?i)(html|innerhtml)") or
@@ -66,7 +71,8 @@ private class HeuristicSqlInjectionSink extends HeuristicSink, SqlInjection::Sin
   HeuristicSqlInjectionSink() {
     isAssignedToOrConcatenatedWith(this, "(?i)(sql|query)") or
     isArgTo(this, "(?i)(query)") or
-    isContatenatedWithString(this, "(?s).*(ALTER|COUNT|CREATE|DATABASE|DELETE|DISTINCT|DROP|FROM|GROUP|INSERT|INTO|LIMIT|ORDER|SELECT|TABLE|UPDATE|WHERE).*")
+    isContatenatedWithString(this,
+      "(?s).*(ALTER|COUNT|CREATE|DATABASE|DELETE|DISTINCT|DROP|FROM|GROUP|INSERT|INTO|LIMIT|ORDER|SELECT|TABLE|UPDATE|WHERE).*")
   }
 }
 
@@ -79,14 +85,18 @@ private class HeuristicNosqlInjectionSink extends HeuristicSink, NosqlInjection:
 
 private class HeuristicTaintedPathSink extends HeuristicSink, TaintedPath::Sink {
   HeuristicTaintedPathSink() {
-    isAssignedToOrConcatenatedWith(this, "(?i)(file|folder|dir|absolute)") or // "path" is too noisy in practice
-    isArgTo(this, "(?i)(get|read)file") or
-    exists (string pathPattern |
+    isAssignedToOrConcatenatedWith(this, "(?i)(file|folder|dir|absolute)") // "path" is too noisy in practice
+    or
+    isArgTo(this, "(?i)(get|read)file")
+    or
+    exists(string pathPattern |
       // paths with at least two parts, and either a trailing or leading slash
       pathPattern = "(?i)([a-z0-9_.-]+/){2,}" or
-      pathPattern = "(?i)(/[a-z0-9_.-]+){2,}" |
+      pathPattern = "(?i)(/[a-z0-9_.-]+){2,}"
+    |
       isContatenatedWithString(this, pathPattern)
-    ) or
+    )
+    or
     isContatenatedWithStrings(".*/", this, "/.*")
   }
 }
@@ -113,9 +123,7 @@ private class HeuristicServerSideUrlRedirectSink extends HeuristicSink, ServerSi
 }
 
 private class HeuristicInsecureRandomTokenSink extends HeuristicSink, InsecureRandomness::Sink {
-
   HeuristicInsecureRandomTokenSink() {
     isAssignedToOrConcatenatedWith(this, "(?i)(token|csrf|unique)")
   }
-
-}
\ No newline at end of file
+}
diff --git a/javascript/ql/src/semmle/javascript/heuristics/AdditionalSources.qll b/javascript/ql/src/semmle/javascript/heuristics/AdditionalSources.qll
index 08eecd979b46..3d59f0402b11 100644
--- a/javascript/ql/src/semmle/javascript/heuristics/AdditionalSources.qll
+++ b/javascript/ql/src/semmle/javascript/heuristics/AdditionalSources.qll
@@ -17,23 +17,18 @@ abstract class HeuristicSource extends DataFlow::Node { }
  * An access to a password, viewed a source of remote flow.
  */
 private class RemoteFlowPassword extends HeuristicSource, RemoteFlowSource {
+  RemoteFlowPassword() { isReadFrom(this, "(?is).*(password|passwd).*") }
 
-  RemoteFlowPassword() {
-    isReadFrom(this, "(?is).*(password|passwd).*")
-  }
-
-  override string getSourceType() {
-    result = "a user provided password"
-  }
-
+  override string getSourceType() { result = "a user provided password" }
 }
 
 /**
  * A use of `JSON.stringify`, viewed as a source for command line injections
  * since it does not properly escape single quotes and dollar symbols.
  */
-private class JSONStringifyAsCommandInjectionSource extends HeuristicSource, CommandInjection::Source {
+private class JSONStringifyAsCommandInjectionSource extends HeuristicSource,
+  CommandInjection::Source {
   JSONStringifyAsCommandInjectionSource() {
     this = DataFlow::globalVarRef("JSON").getAMemberCall("stringify")
   }
-}
\ No newline at end of file
+}
diff --git a/javascript/ql/src/semmle/javascript/heuristics/AdditionalTaintSteps.qll b/javascript/ql/src/semmle/javascript/heuristics/AdditionalTaintSteps.qll
index 830cdc7ea611..e920fb106137 100644
--- a/javascript/ql/src/semmle/javascript/heuristics/AdditionalTaintSteps.qll
+++ b/javascript/ql/src/semmle/javascript/heuristics/AdditionalTaintSteps.qll
@@ -9,19 +9,16 @@ import javascript
 /**
  * A heuristic additional flow step in a security query.
  */
-abstract class HeuristicAdditionalTaintStep extends DataFlow::ValueNode {}
+abstract class HeuristicAdditionalTaintStep extends DataFlow::ValueNode { }
 
 /**
  * A call to `tainted.replace(x, y)` that preserves taint.
  */
-private class HeuristicStringManipulationTaintStep extends HeuristicAdditionalTaintStep, TaintTracking::AdditionalTaintStep, DataFlow::MethodCallNode {
-
-  HeuristicStringManipulationTaintStep() {
-    getMethodName() = "replace"
-  }
+private class HeuristicStringManipulationTaintStep extends HeuristicAdditionalTaintStep,
+  TaintTracking::AdditionalTaintStep, DataFlow::MethodCallNode {
+  HeuristicStringManipulationTaintStep() { getMethodName() = "replace" }
 
   override predicate step(DataFlow::Node pred, DataFlow::Node succ) {
     pred = getReceiver() and succ = this
   }
-
-}
\ No newline at end of file
+}
diff --git a/javascript/ql/src/semmle/javascript/heuristics/SyntacticHeuristics.qll b/javascript/ql/src/semmle/javascript/heuristics/SyntacticHeuristics.qll
index be6e212ec62e..ae49d4672e46 100644
--- a/javascript/ql/src/semmle/javascript/heuristics/SyntacticHeuristics.qll
+++ b/javascript/ql/src/semmle/javascript/heuristics/SyntacticHeuristics.qll
@@ -1,8 +1,9 @@
 /**
  * Provides classes for reasoning syntactically about a program.
- * 
+ *
  * INTERNAL: Do not use outside of the `semmle.javascript.heuristics` module.
  */
+
 import javascript
 
 /**
@@ -15,10 +16,11 @@ import javascript
  */
 bindingset[regexp]
 predicate isReadFrom(DataFlow::Node read, string regexp) {
-  exists (DataFlow::Node actualRead |
+  exists(DataFlow::Node actualRead |
     actualRead = read.asExpr().getUnderlyingValue().(LogOrExpr).getAnOperand().flow() or // unfold `x || y` once
-    actualRead = read |
-    exists (string name | name.regexpMatch(regexp) |
+    actualRead = read
+  |
+    exists(string name | name.regexpMatch(regexp) |
       actualRead.asExpr().getUnderlyingValue().(VarAccess).getName() = name or
       actualRead.(DataFlow::PropRead).getPropertyName() = name or
       actualRead.(DataFlow::InvokeNode).getCalleeName() = "get" + name
@@ -28,33 +30,36 @@ predicate isReadFrom(DataFlow::Node read, string regexp) {
 
 /**
  * Holds if `rhs` is assigned to a "name" that matches `regexp`.
- * 
+ *
  * The "name" is one of:
  * - the name of the written variable, if `rhs` is the right hand side of a variable write
  * - the name of the written property, if `rhs` is the right hand side of a property write
  */
 bindingset[regexp]
 predicate isAssignedTo(DataFlow::Node rhs, string regexp) {
-  exists (string name |
+  exists(string name |
     name.regexpMatch(regexp) and
     // avoid assignments that preserve the name
-    not isReadFrom(rhs, "(?i).*\\Q" + name + "\\E") |
-    exists (Variable var |
+    not isReadFrom(rhs, "(?i).*\\Q" + name + "\\E")
+  |
+    exists(Variable var |
       rhs.asExpr() = var.getAnAssignedExpr() and
       name = var.getName()
-    ) or
-    exists (DataFlow::PropWrite prop |
+    )
+    or
+    exists(DataFlow::PropWrite prop |
       rhs = prop.getRhs() and
       prop.getPropertyName() = name
     )
   )
 }
+
 /**
  * Holds if `arg` is an argument to a callee with a name that matches `regexp`.
  */
 bindingset[regexp]
 predicate isArgTo(DataFlow::Node arg, string regexp) {
-  exists (DataFlow::InvokeNode invk |
+  exists(DataFlow::InvokeNode invk |
     invk.getCalleeName().regexpMatch(regexp) and
     arg = invk.getAnArgument()
   )
@@ -65,22 +70,23 @@ predicate isArgTo(DataFlow::Node arg, string regexp) {
  */
 bindingset[regexp]
 predicate isConcatenatedWith(DataFlow::Node n, string regexp) {
-  exists (Expr other |
+  exists(Expr other |
     other = n.asExpr().(AddExpr).getAnOperand() or
-    other = n.asExpr().(AssignAddExpr).getRhs() |
+    other = n.asExpr().(AssignAddExpr).getRhs()
+  |
     isReadFrom(DataFlow::valueNode(other), regexp)
   )
 }
 
-
 /**
  * Holds if `n` is concatenated with a string constant that matches `regexp`.
  */
 bindingset[regexp]
 predicate isContatenatedWithString(DataFlow::Node n, string regexp) {
-  exists (Expr other |
+  exists(Expr other |
     other = n.asExpr().(AddExpr).getAnOperand() or
-    other = n.asExpr().(AssignAddExpr).getRhs() |
+    other = n.asExpr().(AssignAddExpr).getRhs()
+  |
     other.getStringValue().regexpMatch(regexp)
   )
 }
@@ -90,7 +96,7 @@ predicate isContatenatedWithString(DataFlow::Node n, string regexp) {
  */
 bindingset[lRegexp, rRegexp]
 predicate isContatenatedWithStrings(string lRegexp, DataFlow::Node n, string rRegexp) {
-  exists (AddExpr concat1, AddExpr concat2 |
+  exists(AddExpr concat1, AddExpr concat2 |
     concat1.getLeftOperand().getStringValue().regexpMatch(lRegexp) and
     concat1.getRightOperand() = n.asExpr() and
     concat2.getLeftOperand() = concat1 and
diff --git a/javascript/ql/src/semmle/javascript/heuristics/all.qll b/javascript/ql/src/semmle/javascript/heuristics/all.qll
index 7d0079a8e226..d50df7a887b4 100644
--- a/javascript/ql/src/semmle/javascript/heuristics/all.qll
+++ b/javascript/ql/src/semmle/javascript/heuristics/all.qll
@@ -11,4 +11,4 @@ import AdditionalPromises
 import AdditionalRouteHandlers
 import AdditionalSources
 import AdditionalSinks
-import AdditionalTaintSteps
\ No newline at end of file
+import AdditionalTaintSteps
diff --git a/javascript/ql/src/semmle/javascript/linters/ESLint.qll b/javascript/ql/src/semmle/javascript/linters/ESLint.qll
index ff5ca17faf44..df9a991cf1a9 100644
--- a/javascript/ql/src/semmle/javascript/linters/ESLint.qll
+++ b/javascript/ql/src/semmle/javascript/linters/ESLint.qll
@@ -10,14 +10,10 @@ module ESLint {
    */
   abstract class Configuration extends Locatable {
     /** Gets the folder in which this configuration file is located. */
-    private Folder getEnclosingFolder() {
-      result = getFile().getParentContainer()
-    }
+    private Folder getEnclosingFolder() { result = getFile().getParentContainer() }
 
     /** Holds if this configuration file applies to the code in `tl`. */
-    predicate appliesTo(TopLevel tl) {
-      tl.getFile().getParentContainer+() = getEnclosingFolder()
-    }
+    predicate appliesTo(TopLevel tl) { tl.getFile().getParentContainer+() = getEnclosingFolder() }
 
     /** Gets the `globals` configuration object of this file, if any. */
     abstract ConfigurationObject getGlobals();
@@ -38,32 +34,26 @@ module ESLint {
   }
 
   /** An ESLint configuration file in JSON format. */
-  private abstract class JsonConfiguration extends Configuration, JSONObject {
-  }
+  abstract private class JsonConfiguration extends Configuration, JSONObject { }
 
   /** An `.eslintrc.json` file. */
   private class EslintrcJson extends JsonConfiguration {
     EslintrcJson() {
       isTopLevel() and
-      exists (string n | n = getFile().getBaseName() |
-        n = ".eslintrc.json" or n = ".eslintrc"
-      )
+      exists(string n | n = getFile().getBaseName() | n = ".eslintrc.json" or n = ".eslintrc")
     }
 
-    override ConfigurationObject getGlobals() {
-      result = getPropValue("globals")
-    }
+    override ConfigurationObject getGlobals() { result = getPropValue("globals") }
   }
 
   /** An ESLint configuration object in JSON format. */
   private class JsonConfigurationObject extends ConfigurationObject, JSONObject {
-    override Configuration getConfiguration() {
-      this = result.(JsonConfiguration).getPropValue(_)
-    }
+    override Configuration getConfiguration() { this = result.(JsonConfiguration).getPropValue(_) }
 
     override boolean getBooleanProperty(string p) {
-      exists (string v | v = getPropValue(p).(JSONBoolean).getValue() |
-        v = "true" and result = true or
+      exists(string v | v = getPropValue(p).(JSONBoolean).getValue() |
+        v = "true" and result = true
+        or
         v = "false" and result = false
       )
     }
@@ -72,25 +62,22 @@ module ESLint {
   /** An `.eslintrc.yaml` file. */
   private class EslintrcYaml extends Configuration, YAMLDocument, YAMLMapping {
     EslintrcYaml() {
-      exists (string n | n = getFile().getBaseName() |
+      exists(string n | n = getFile().getBaseName() |
         n = ".eslintrc.yaml" or n = ".eslintrc.yml" or n = ".eslintrc"
       )
     }
 
-    override ConfigurationObject getGlobals() {
-      result = lookup("globals")
-    }
+    override ConfigurationObject getGlobals() { result = lookup("globals") }
   }
 
   /** An ESLint configuration object in YAML format. */
   private class YamlConfigurationObject extends ConfigurationObject, YAMLMapping {
-    override Configuration getConfiguration() {
-      this = result.(EslintrcYaml).getValue(_)
-    }
+    override Configuration getConfiguration() { this = result.(EslintrcYaml).getValue(_) }
 
     override boolean getBooleanProperty(string p) {
-      exists (string v | v = lookup(p).(YAMLBool).getValue() |
-        v = "true" and result = true or
+      exists(string v | v = lookup(p).(YAMLBool).getValue() |
+        v = "true" and result = true
+        or
         v = "false" and result = false
       )
     }
@@ -99,29 +86,24 @@ module ESLint {
   /** An ESLint configuration embedded in a `package.json` file. */
   private class EslintConfigInPackageJson extends JsonConfiguration {
     EslintConfigInPackageJson() {
-      exists (PackageJSON pkg | this = pkg.getPropValue("eslintConfig"))
+      exists(PackageJSON pkg | this = pkg.getPropValue("eslintConfig"))
     }
 
-    override ConfigurationObject getGlobals() {
-      result = getPropValue("globals")
-    }
+    override ConfigurationObject getGlobals() { result = getPropValue("globals") }
   }
 
   /** An ESLint `globals` configuration object. */
   class GlobalsConfigurationObject extends Linting::GlobalDeclaration, ConfigurationObject {
-    GlobalsConfigurationObject() {
-      this = any(Configuration cfg).getGlobals()
-    }
+    GlobalsConfigurationObject() { this = any(Configuration cfg).getGlobals() }
 
     override predicate declaresGlobal(string name, boolean writable) {
       getBooleanProperty(name) = writable
     }
 
-    override predicate appliesTo(ExprOrStmt s) {
-      getConfiguration().appliesTo(s.getTopLevel())
-    }
+    override predicate appliesTo(ExprOrStmt s) { getConfiguration().appliesTo(s.getTopLevel()) }
+
+    abstract override Configuration getConfiguration();
 
-    override abstract Configuration getConfiguration();
-    override abstract boolean getBooleanProperty(string p);
+    abstract override boolean getBooleanProperty(string p);
   }
 }
diff --git a/javascript/ql/src/semmle/javascript/linters/JSLint.qll b/javascript/ql/src/semmle/javascript/linters/JSLint.qll
index 136122f01bdf..6d6f0edde612 100644
--- a/javascript/ql/src/semmle/javascript/linters/JSLint.qll
+++ b/javascript/ql/src/semmle/javascript/linters/JSLint.qll
@@ -10,7 +10,9 @@ private string getDirectiveName(SlashStarComment c) {
 }
 
 /** Gets a function at the specified location. */
-private Function getFunctionAt(string filepath, int startline, int startcolumn, int endline, int endcolumn) {
+private Function getFunctionAt(
+  string filepath, int startline, int startcolumn, int endline, int endcolumn
+) {
   result.getLocation().hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
 }
 
@@ -21,8 +23,9 @@ abstract class JSLintDirective extends SlashStarComment {
    * and with end-of-line characters replaced by spaces.
    */
   string getContent() {
-    result = getText().regexpReplaceAll("[\\n\\r\\u2028\\u2029]", " ")
-                      .regexpCapture("\\s*\\w+ (.*)", 1)
+    result = getText()
+          .regexpReplaceAll("[\\n\\r\\u2028\\u2029]", " ")
+          .regexpCapture("\\s*\\w+ (.*)", 1)
   }
 
   /**
@@ -31,23 +34,28 @@ abstract class JSLintDirective extends SlashStarComment {
    * Like JSHint (but unlike JSLint), this predicate allows whitespace before the
    * directive name.
    */
-  string getName() {
-    result = getDirectiveName(this)
-  }
+  string getName() { result = getDirectiveName(this) }
 
   /**
    * Gets the function surrounding this directive, if any.
    */
   private Function getASurroundingFunction() {
-    exists (string path, int fsl, int fsc, int fel, int fec,
-                         int dsl, int dsc, int del, int dec |
+    exists(string path, int fsl, int fsc, int fel, int fec, int dsl, int dsc, int del, int dec |
       result = getFunctionAt(path, fsl, fsc, fel, fec) and
-      this.getLocation().hasLocationInfo(path, dsl, dsc, del, dec) |
+      this.getLocation().hasLocationInfo(path, dsl, dsc, del, dec)
+    |
       // the function starts before this directive
-      (fsl < dsl or (fsl = dsl and fsc <= dsc))
-      and
+      (
+        fsl < dsl
+        or
+        (fsl = dsl and fsc <= dsc)
+      ) and
       // and it ends after this directive
-      (del < fel or (del = fel and dec <= fec))
+      (
+        del < fel
+        or
+        (del = fel and dec <= fec)
+      )
     )
   }
 
@@ -69,13 +77,15 @@ abstract class JSLintDirective extends SlashStarComment {
    * is the empty string.
    */
   predicate definesFlag(string name, string value) {
-    exists (string defn | defn = getContent().splitAt(",").trim() |
-      if defn.matches("%:%") then
-        (name = defn.splitAt(":", 0).trim() and
-         value = defn.splitAt(":", 1).trim())
-      else
-        (name = defn and
-         value = "")
+    exists(string defn | defn = getContent().splitAt(",").trim() |
+      if defn.matches("%:%")
+      then (
+        name = defn.splitAt(":", 0).trim() and
+        value = defn.splitAt(":", 1).trim()
+      ) else (
+        name = defn and
+        value = ""
+      )
     )
   }
 
@@ -84,8 +94,7 @@ abstract class JSLintDirective extends SlashStarComment {
    * `s` is nested in the directive's scope.
    */
   predicate appliesTo(ExprOrStmt s) {
-    exists (StmtContainer sc |
-      sc = s.(Stmt).getContainer() or sc = s.(Expr).getContainer() |
+    exists(StmtContainer sc | sc = s.(Stmt).getContainer() or sc = s.(Expr).getContainer() |
       getScope() = sc.getEnclosingContainer*()
     )
   }
@@ -98,9 +107,7 @@ abstract class JSLintDirective extends SlashStarComment {
  * declares a group of related global variables.
  */
 abstract class JSLintGlobal extends Linting::GlobalDeclaration, JSLintDirective {
-  override predicate appliesTo(ExprOrStmt s) {
-    JSLintDirective.super.appliesTo(s)
-  }
+  override predicate appliesTo(ExprOrStmt s) { JSLintDirective.super.appliesTo(s) }
 
   override predicate declaresGlobalForAccess(GlobalVarAccess gva) {
     declaresGlobal(gva.getName(), _) and
@@ -110,15 +117,14 @@ abstract class JSLintGlobal extends Linting::GlobalDeclaration, JSLintDirective
 
 /** A JSLint `global` directive. */
 class JSLintExplicitGlobal extends JSLintGlobal {
-  JSLintExplicitGlobal() {
-    getDirectiveName(this) = "global"
-  }
+  JSLintExplicitGlobal() { getDirectiveName(this) = "global" }
 
   override predicate declaresGlobal(string name, boolean writable) {
-    exists (string value | definesFlag(name, value) |
+    exists(string value | definesFlag(name, value) |
       writable = true and value = "true"
       or
-      writable = false and (value = "false" or value = "")
+      writable = false and
+      (value = "false" or value = "")
     )
   }
 }
@@ -126,7 +132,7 @@ class JSLintExplicitGlobal extends JSLintGlobal {
 /** A JSLint `properties` directive. */
 class JSLintProperties extends JSLintDirective {
   JSLintProperties() {
-    exists (string name | name = getDirectiveName(this) |
+    exists(string name | name = getDirectiveName(this) |
       name = "property" or name = "properties" or name = "members"
     )
   }
@@ -134,16 +140,12 @@ class JSLintProperties extends JSLintDirective {
   /**
    * Gets a property declared by this directive.
    */
-  string getAProperty() {
-    result = getContent().splitAt(",").trim()
-  }
+  string getAProperty() { result = getContent().splitAt(",").trim() }
 }
 
 /** A JSLint options directive. */
 class JSLintOptions extends JSLintDirective {
-  JSLintOptions() {
-    getDirectiveName(this) = "jslint"
-  }
+  JSLintOptions() { getDirectiveName(this) = "jslint" }
 }
 
 /**
@@ -151,30 +153,101 @@ class JSLintOptions extends JSLintDirective {
  */
 private string jsLintImplicitGlobal(string category) {
   // cf. http://www.jslint.com/help.html#global
-  (category = "browser" and
-   (result = "clearInterval" or result = "clearTimeout" or result = "document" or
-    result = "event" or result = "frames" or result = "history" or result = "Image" or
-    result = "location" or result = "name" or result = "navigator" or result = "Option" or
-    result = "parent" or result = "screen" or result = "setInterval" or result = "setTimeout" or
-    result = "window" or result = "XMLHttpRequest")) or
-  (category = "devel" and
-   (result = "alert" or result = "confirm" or result = "console" or
-    result = "Debug" or result = "opera" or result = "prompt" or result = "WSH")) or
-  (category = "node" and
-   (result = "Buffer" or result = "clearInterval" or result = "clearTimeout" or
-    result = "console" or result = "exports" or result = "result" or result = "module" or
-    result = "process" or result = "querystring" or result = "require" or result = "setInterval" or
-    result = "setTimeout" or result = "__filename" or result = "__dirname")) or
-  (category = "couch" and
-   (result = "emit" or result = "getRow" or result = "isArray" or result = "log" or
-    result = "provides" or result = "registerType" or result = "require" or result = "send" or
-    result = "start" or result = "sum" or result = "toJSON")) or
-  (category = "rhino" and
-   (result = "defineClass" or result = "deserialize" or result = "gc" or result = "help" or
-    result = "load" or result = "loadClass" or result = "print" or result = "quit" or
-    result = "readFile" or result = "readUrl" or result = "runCommand" or result = "seal" or
-    result = "serialize" or result = "spawn" or result = "sync" or result = "toint32" or
-    result = "version"))
+  (
+    category = "browser" and
+    (
+      result = "clearInterval" or
+      result = "clearTimeout" or
+      result = "document" or
+      result = "event" or
+      result = "frames" or
+      result = "history" or
+      result = "Image" or
+      result = "location" or
+      result = "name" or
+      result = "navigator" or
+      result = "Option" or
+      result = "parent" or
+      result = "screen" or
+      result = "setInterval" or
+      result = "setTimeout" or
+      result = "window" or
+      result = "XMLHttpRequest"
+    )
+  )
+  or
+  (
+    category = "devel" and
+    (
+      result = "alert" or
+      result = "confirm" or
+      result = "console" or
+      result = "Debug" or
+      result = "opera" or
+      result = "prompt" or
+      result = "WSH"
+    )
+  )
+  or
+  (
+    category = "node" and
+    (
+      result = "Buffer" or
+      result = "clearInterval" or
+      result = "clearTimeout" or
+      result = "console" or
+      result = "exports" or
+      result = "result" or
+      result = "module" or
+      result = "process" or
+      result = "querystring" or
+      result = "require" or
+      result = "setInterval" or
+      result = "setTimeout" or
+      result = "__filename" or
+      result = "__dirname"
+    )
+  )
+  or
+  (
+    category = "couch" and
+    (
+      result = "emit" or
+      result = "getRow" or
+      result = "isArray" or
+      result = "log" or
+      result = "provides" or
+      result = "registerType" or
+      result = "require" or
+      result = "send" or
+      result = "start" or
+      result = "sum" or
+      result = "toJSON"
+    )
+  )
+  or
+  (
+    category = "rhino" and
+    (
+      result = "defineClass" or
+      result = "deserialize" or
+      result = "gc" or
+      result = "help" or
+      result = "load" or
+      result = "loadClass" or
+      result = "print" or
+      result = "quit" or
+      result = "readFile" or
+      result = "readUrl" or
+      result = "runCommand" or
+      result = "seal" or
+      result = "serialize" or
+      result = "spawn" or
+      result = "sync" or
+      result = "toint32" or
+      result = "version"
+    )
+  )
 }
 
 /**
@@ -182,7 +255,7 @@ private string jsLintImplicitGlobal(string category) {
  */
 private class JSLintImplicitGlobal extends JSLintOptions, JSLintGlobal {
   JSLintImplicitGlobal() {
-    exists (string category |
+    exists(string category |
       definesFlag(category, "true") and
       exists(jsLintImplicitGlobal(category))
     )
@@ -190,9 +263,9 @@ private class JSLintImplicitGlobal extends JSLintOptions, JSLintGlobal {
 
   override predicate declaresGlobal(string name, boolean writable) {
     writable = false and
-    exists (string category |
+    exists(string category |
       definesFlag(category, "true") and
       name = jsLintImplicitGlobal(category)
     )
   }
-}
\ No newline at end of file
+}
diff --git a/javascript/ql/src/semmle/javascript/linters/Linting.qll b/javascript/ql/src/semmle/javascript/linters/Linting.qll
index 233aff46fc84..e5b724e05d21 100644
--- a/javascript/ql/src/semmle/javascript/linters/Linting.qll
+++ b/javascript/ql/src/semmle/javascript/linters/Linting.qll
@@ -28,4 +28,4 @@ module Linting {
       appliesTo(gva) and declaresGlobal(gva.getName(), _)
     }
   }
-}
\ No newline at end of file
+}
diff --git a/javascript/ql/src/semmle/javascript/security/SensitiveActions.qll b/javascript/ql/src/semmle/javascript/security/SensitiveActions.qll
index b3df3b6c2b3d..100ea0984ae4 100644
--- a/javascript/ql/src/semmle/javascript/security/SensitiveActions.qll
+++ b/javascript/ql/src/semmle/javascript/security/SensitiveActions.qll
@@ -17,21 +17,14 @@ import javascript
  * INTERNAL: Do not use directly.
  */
 module HeuristicNames {
-
   /** A regular expression that identifies strings that look like they represent secret data that are not passwords. */
-  string suspiciousNonPassword() {
-    result = "(?is).*(secret|account|accnt|(?<!un)trusted).*"
-  }
+  string suspiciousNonPassword() { result = "(?is).*(secret|account|accnt|(?<!un)trusted).*" }
 
   /** A regular expression that identifies strings that look like they represent secret data that are passwords. */
-  string suspiciousPassword() {
-    result = "(?is).*(password|passwd).*"
-  }
+  string suspiciousPassword() { result = "(?is).*(password|passwd).*" }
 
   /** A regular expression that identifies strings that look like they represent secret data. */
-  string suspicious() {
-    result = suspiciousPassword() or result = suspiciousNonPassword()
-  }
+  string suspicious() { result = suspiciousPassword() or result = suspiciousNonPassword() }
 
   /**
    * A regular expression that identifies strings that look like they represent data that is
@@ -40,7 +33,6 @@ module HeuristicNames {
   string nonSuspicious() {
     result = "(?is).*(redact|censor|obfuscate|hash|md5|sha|((?<!un)(en))?(crypt|code)).*"
   }
-
 }
 private import HeuristicNames
 
@@ -53,7 +45,8 @@ abstract class SensitiveExpr extends Expr {
 /** A function call that might produce sensitive data. */
 class SensitiveCall extends SensitiveExpr, InvokeExpr {
   SensitiveCall() {
-    this.getCalleeName() instanceof SensitiveDataFunctionName or
+    this.getCalleeName() instanceof SensitiveDataFunctionName
+    or
     // This is particularly to pick up methods with an argument like "password", which
     // may indicate a lookup.
     exists(string s | this.getAnArgument().mayHaveStringValue(s) |
@@ -62,9 +55,7 @@ class SensitiveCall extends SensitiveExpr, InvokeExpr {
     )
   }
 
-  override string describe() {
-    result = "a call to " + getCalleeName()
-  }
+  override string describe() { result = "a call to " + getCalleeName() }
 }
 
 /** An access to a variable or property that might contain sensitive data. */
@@ -74,15 +65,13 @@ abstract class SensitiveVariableAccess extends SensitiveExpr {
   SensitiveVariableAccess() {
     this.(VarAccess).getName() = name
     or
-    exists (DataFlow::PropRead pr |
+    exists(DataFlow::PropRead pr |
       this = pr.asExpr() and
       pr.getPropertyName() = name
     )
   }
 
-  override string describe() {
-    result = "an access to " + name
-  }
+  override string describe() { result = "an access to " + name }
 }
 
 /** A write to a location that might contain sensitive data. */
@@ -90,37 +79,34 @@ abstract class SensitiveWrite extends DataFlow::Node { }
 
 /** A write to a variable or property that might contain sensitive data. */
 private class BasicSensitiveWrite extends SensitiveWrite {
-
   BasicSensitiveWrite() {
-    exists (string name |
+    exists(string name |
       name.regexpMatch(suspicious()) and
-      not name.regexpMatch(nonSuspicious()) |
-      exists (DataFlow::PropWrite pwn |
+      not name.regexpMatch(nonSuspicious())
+    |
+      exists(DataFlow::PropWrite pwn |
         pwn.getPropertyName() = name and
         pwn.getRhs() = this
-      ) or
-      exists (VarDef v |
-        v.getAVariable().getName() = name |
-        if exists (v.getSource()) then
-          v.getSource() = this.asExpr()
+      )
+      or
+      exists(VarDef v | v.getAVariable().getName() = name |
+        if exists(v.getSource())
+        then v.getSource() = this.asExpr()
         else
-          exists (SsaExplicitDefinition ssa |
+          exists(SsaExplicitDefinition ssa |
             DataFlow::ssaDefinitionNode(ssa) = this and
             ssa.getDef() = v
           )
       )
     )
   }
-
 }
 
 /** An access to a variable or property that might contain sensitive data. */
 private class BasicSensitiveVariableAccess extends SensitiveVariableAccess {
-
   BasicSensitiveVariableAccess() {
     name.regexpMatch(suspicious()) and not name.regexpMatch(nonSuspicious())
   }
-
 }
 
 /** A function name that suggests it may be sensitive. */
@@ -133,13 +119,11 @@ abstract class SensitiveFunctionName extends string {
 }
 
 /** A function name that suggests it may produce sensitive data. */
-abstract class SensitiveDataFunctionName extends SensitiveFunctionName {}
+abstract class SensitiveDataFunctionName extends SensitiveFunctionName { }
 
 /** A method that might return sensitive data, based on the name. */
 class CredentialsFunctionName extends SensitiveDataFunctionName {
-  CredentialsFunctionName() {
-    this.regexpMatch(suspicious())
-  }
+  CredentialsFunctionName() { this.regexpMatch(suspicious()) }
 }
 
 /**
@@ -149,7 +133,6 @@ abstract class SensitiveAction extends DataFlow::Node { }
 
 /** A call that may perform authorization. */
 class AuthorizationCall extends SensitiveAction, DataFlow::CallNode {
-
   AuthorizationCall() {
     exists(string s | s = getCalleeName() |
       // name contains `login` or `auth`, but not as part of `loginfo` or `unauth`;
@@ -159,14 +142,12 @@ class AuthorizationCall extends SensitiveAction, DataFlow::CallNode {
       not s.regexpMatch("(?i)(get|set).*")
     )
   }
-
 }
 
 /**
  * Classes for expressions containing cleartext passwords.
  */
 private module CleartextPasswords {
-
   bindingset[name]
   private predicate isCleartextPasswordIndicator(string name) {
     name.regexpMatch(suspiciousPassword()) and
@@ -178,18 +159,17 @@ private module CleartextPasswords {
 
   /** A function name that suggests it may produce a cleartext password. */
   private class CleartextPasswordDataFunctionName extends SensitiveDataFunctionName {
-    CleartextPasswordDataFunctionName() {
-      isCleartextPasswordIndicator(this)
-    }
+    CleartextPasswordDataFunctionName() { isCleartextPasswordIndicator(this) }
   }
 
   /** A call that might return a cleartext password. */
   private class CleartextPasswordCallExpr extends CleartextPasswordExpr, SensitiveCall {
     CleartextPasswordCallExpr() {
-      this.getCalleeName() instanceof CleartextPasswordDataFunctionName or
+      this.getCalleeName() instanceof CleartextPasswordDataFunctionName
+      or
       // This is particularly to pick up methods with an argument like "password", which
       // may indicate a lookup.
-      exists (string s |
+      exists(string s |
         this.getAnArgument().mayHaveStringValue(s) and
         isCleartextPasswordIndicator(s)
       )
@@ -198,10 +178,7 @@ private module CleartextPasswords {
 
   /** An access to a variable or property that might contain a cleartext password. */
   private class CleartextPasswordLookupExpr extends CleartextPasswordExpr, SensitiveVariableAccess {
-    CleartextPasswordLookupExpr() {
-      isCleartextPasswordIndicator(name)
-    }
+    CleartextPasswordLookupExpr() { isCleartextPasswordIndicator(name) }
   }
-
 }
 import CleartextPasswords
diff --git a/javascript/ql/src/semmle/javascript/security/TaintedObject.qll b/javascript/ql/src/semmle/javascript/security/TaintedObject.qll
index efb5545b2c3d..886cd148e43a 100644
--- a/javascript/ql/src/semmle/javascript/security/TaintedObject.qll
+++ b/javascript/ql/src/semmle/javascript/security/TaintedObject.qll
@@ -12,6 +12,7 @@
  * 3. The flow steps from `TaintedObject::step`.
  * 4. The sanitizing guards `TaintedObject::SanitizerGuard`.
  */
+
 import javascript
 
 module TaintedObject {
@@ -28,7 +29,7 @@ module TaintedObject {
    *
    * Note that the presence of the this label generally implies the presence of the `taint` label as well.
    */
-  FlowLabel label() { result instanceof TaintedObjectLabel  }
+  FlowLabel label() { result instanceof TaintedObjectLabel }
 
   /**
    * Holds for the flows steps that are relevant for tracking user-controlled JSON objects.
@@ -37,9 +38,10 @@ module TaintedObject {
     // JSON parsers map tainted inputs to tainted JSON
     (inlbl = FlowLabel::data() or inlbl = FlowLabel::taint()) and
     outlbl = label() and
-    exists (JsonParserCall parse |
+    exists(JsonParserCall parse |
       src = parse.getInput() and
-      trg = parse.getOutput())
+      trg = parse.getOutput()
+    )
     or
     // Property reads preserve deep object taint.
     inlbl = label() and
@@ -54,40 +56,35 @@ module TaintedObject {
     // Extending objects preserves deep object taint
     inlbl = label() and
     outlbl = label() and
-    exists (ExtendCall call |
+    exists(ExtendCall call |
       src = call.getAnOperand() and
       trg = call
       or
       src = call.getASourceOperand() and
-      trg = call.getDestinationOperand().getALocalSource())
+      trg = call.getDestinationOperand().getALocalSource()
+    )
   }
 
   /**
    * Holds if `node` is a source of JSON taint and label is the JSON taint label.
    */
-  predicate isSource(Node source, FlowLabel label) {
-    source instanceof Source and label = label()
-  }
+  predicate isSource(Node source, FlowLabel label) { source instanceof Source and label = label() }
 
   /**
    * A source of a user-controlled deep object.
    */
-  abstract class Source extends DataFlow::Node {}
+  abstract class Source extends DataFlow::Node { }
 
   /** Request input accesses as a JSON source. */
   private class RequestInputAsSource extends Source {
-    RequestInputAsSource() {
-      this.(HTTP::RequestInputAccess).isUserControlledObject()
-    }
+    RequestInputAsSource() { this.(HTTP::RequestInputAccess).isUserControlledObject() }
   }
 
   /**
    * Sanitizer guard that blocks deep object taint.
    */
   abstract class SanitizerGuard extends TaintTracking::LabeledSanitizerGuardNode {
-    override FlowLabel getALabel() {
-      result = label()
-    }
+    override FlowLabel getALabel() { result = label() }
   }
 
   /**
@@ -95,7 +92,9 @@ module TaintedObject {
    */
   private class TypeTestGuard extends SanitizerGuard, ValueNode {
     override EqualityTest astNode;
+
     TypeofExpr typeof;
+
     boolean polarity;
 
     TypeTestGuard() {
diff --git a/javascript/ql/src/semmle/javascript/security/dataflow/BrokenCryptoAlgorithm.qll b/javascript/ql/src/semmle/javascript/security/dataflow/BrokenCryptoAlgorithm.qll
index 5f3381dc140f..a327bdb15b33 100644
--- a/javascript/ql/src/semmle/javascript/security/dataflow/BrokenCryptoAlgorithm.qll
+++ b/javascript/ql/src/semmle/javascript/security/dataflow/BrokenCryptoAlgorithm.qll
@@ -1,6 +1,7 @@
 /**
  * Provides a taint tracking configuration for reasoning about sensitive information in broken or weak cryptographic algorithms.
  */
+
 import javascript
 private import semmle.javascript.security.SensitiveActions
 private import semmle.javascript.frameworks.CryptoLibraries
@@ -36,18 +37,11 @@ module BrokenCryptoAlgorithm {
   class Configuration extends TaintTracking::Configuration {
     Configuration() { this = "BrokenCryptoAlgorithm" }
 
-    override
-    predicate isSource(DataFlow::Node source) {
-      source instanceof Source
-    }
+    override predicate isSource(DataFlow::Node source) { source instanceof Source }
 
-    override
-    predicate isSink(DataFlow::Node sink) {
-      sink instanceof Sink
-    }
+    override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
 
-    override
-    predicate isSanitizer(DataFlow::Node node) {
+    override predicate isSanitizer(DataFlow::Node node) {
       super.isSanitizer(node) or
       node instanceof Sanitizer
     }
@@ -60,9 +54,7 @@ module BrokenCryptoAlgorithm {
   class SensitiveExprSource extends Source, DataFlow::ValueNode {
     override SensitiveExpr astNode;
 
-    override string describe() {
-      result = astNode.describe()
-    }
+    override string describe() { result = astNode.describe() }
   }
 
   /**
diff --git a/javascript/ql/src/semmle/javascript/security/dataflow/CleartextLogging.qll b/javascript/ql/src/semmle/javascript/security/dataflow/CleartextLogging.qll
index 7ab3b0689c25..0fd1aaceadce 100644
--- a/javascript/ql/src/semmle/javascript/security/dataflow/CleartextLogging.qll
+++ b/javascript/ql/src/semmle/javascript/security/dataflow/CleartextLogging.qll
@@ -1,6 +1,7 @@
 /**
  * Provides a dataflow tracking configuration for reasoning about clear-text logging of sensitive information.
  */
+
 import javascript
 private import semmle.javascript.dataflow.InferredTypes
 private import semmle.javascript.security.SensitiveActions::HeuristicNames
@@ -36,30 +37,21 @@ module CleartextLogging {
   class Configuration extends DataFlow::Configuration {
     Configuration() { this = "CleartextLogging" }
 
-    override
-    predicate isSource(DataFlow::Node source) {
-      source instanceof Source
-    }
+    override predicate isSource(DataFlow::Node source) { source instanceof Source }
 
-    override
-    predicate isSink(DataFlow::Node sink) {
-      sink instanceof Sink
-    }
+    override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
 
-    override
-    predicate isBarrier(DataFlow::Node node) {
-      node instanceof Barrier
-    }
+    override predicate isBarrier(DataFlow::Node node) { node instanceof Barrier }
 
     override predicate isAdditionalFlowStep(DataFlow::Node src, DataFlow::Node trg) {
       StringConcatenation::taintStep(src, trg)
       or
-      exists (string name | name = "toString" or name = "valueOf" |
+      exists(string name | name = "toString" or name = "valueOf" |
         src.(DataFlow::SourceNode).getAMethodCall(name) = trg
-      ) 
+      )
       or
       // A taint propagating data flow edge through objects: a tainted write taints the entire object.
-      exists (DataFlow::PropWrite write |
+      exists(DataFlow::PropWrite write |
         write.getRhs() = src and
         trg.(DataFlow::SourceNode).flowsTo(write.getBase())
       )
@@ -70,19 +62,15 @@ module CleartextLogging {
    * An argument to a logging mechanism.
    */
   class LoggerSink extends Sink {
-    LoggerSink() {
-      this = any(LoggerCall log).getAMessageComponent()
-    }
+    LoggerSink() { this = any(LoggerCall log).getAMessageComponent() }
   }
 
   /**
    * A data flow node that does not contain a clear-text password, according to its syntactic name.
    */
   private class NameGuidedNonCleartextPassword extends NonCleartextPassword {
-
     NameGuidedNonCleartextPassword() {
-      exists (string name |
-        name.regexpMatch(nonSuspicious()) |
+      exists(string name | name.regexpMatch(nonSuspicious()) |
         this.asExpr().(VarAccess).getName() = name
         or
         this.(DataFlow::PropRead).getPropertyName() = name
@@ -91,50 +79,45 @@ module CleartextLogging {
       )
       or
       // avoid i18n strings
-      this.(DataFlow::PropRead).getBase().asExpr().(VarRef).getName().regexpMatch("(?is).*(messages|strings).*")
+      this
+          .(DataFlow::PropRead)
+          .getBase()
+          .asExpr()
+          .(VarRef)
+          .getName()
+          .regexpMatch("(?is).*(messages|strings).*")
     }
-
   }
 
   /**
    * A data flow node that is definitely not an object.
    */
   private class NonObject extends NonCleartextPassword {
-
     NonObject() {
-      forall (AbstractValue v | v = analyze().getAValue() |
-        not v.getType() = TTObject()
-      )
+      forall(AbstractValue v | v = analyze().getAValue() | not v.getType() = TTObject())
     }
-
   }
 
   /**
    * A data flow node that receives flow that is not a clear-text password.
    */
   private class NonCleartextPasswordFlow extends NonCleartextPassword {
-
     NonCleartextPasswordFlow() {
       any(NonCleartextPassword other).(DataFlow::SourceNode).flowsTo(this)
     }
-
   }
 
   /**
    * A call that might obfuscate a password, for example through hashing.
    */
   private class ObfuscatorCall extends Barrier, DataFlow::InvokeNode {
-
-    ObfuscatorCall() {
-      getCalleeName().regexpMatch(nonSuspicious())
-    }
-
+    ObfuscatorCall() { getCalleeName().regexpMatch(nonSuspicious()) }
   }
 
   /**
    * A data flow node that does not contain a clear-text password.
    */
-  private abstract class NonCleartextPassword extends DataFlow::Node { }
+  abstract private class NonCleartextPassword extends DataFlow::Node { }
 
   /**
    * An object with a property that may contain password information
@@ -145,7 +128,7 @@ module CleartextLogging {
     string name;
 
     ObjectPasswordPropertySource() {
-      exists (DataFlow::PropWrite write |
+      exists(DataFlow::PropWrite write |
         name.regexpMatch(suspiciousPassword()) and
         not name.regexpMatch(nonSuspicious()) and
         write = this.(DataFlow::SourceNode).getAPropertyWrite(name) and
@@ -154,9 +137,7 @@ module CleartextLogging {
       )
     }
 
-    override string describe() {
-      result = "an access to " + name
-    }
+    override string describe() { result = "an access to " + name }
   }
 
   /** An access to a variable or property that might contain a password. */
@@ -170,19 +151,17 @@ module CleartextLogging {
       (
         this.asExpr().(VarAccess).getName() = name
         or
-        exists (DataFlow::SourceNode base |
+        exists(DataFlow::SourceNode base |
           this = base.getAPropertyRead(name) and
           // avoid safe values assigned to presumably unsafe names
-          exists (DataFlow::SourceNode baseObj | baseObj.flowsTo(base) |
+          exists(DataFlow::SourceNode baseObj | baseObj.flowsTo(base) |
             not base.getAPropertyWrite(name).getRhs() instanceof NonCleartextPassword
           )
         )
       )
     }
 
-    override string describe() {
-      result = "an access to " + name
-    }
+    override string describe() { result = "an access to " + name }
   }
 
   /** A call that might return a password. */
@@ -194,9 +173,6 @@ module CleartextLogging {
       name.regexpMatch("(?is)getPassword")
     }
 
-    override string describe() {
-      result = "a call to " + name
-    }
+    override string describe() { result = "a call to " + name }
   }
-
-}
\ No newline at end of file
+}
diff --git a/javascript/ql/src/semmle/javascript/security/dataflow/CleartextStorage.qll b/javascript/ql/src/semmle/javascript/security/dataflow/CleartextStorage.qll
index f6e9e73dea0b..e178cb267a27 100644
--- a/javascript/ql/src/semmle/javascript/security/dataflow/CleartextStorage.qll
+++ b/javascript/ql/src/semmle/javascript/security/dataflow/CleartextStorage.qll
@@ -1,6 +1,7 @@
 /**
  * Provides a taint tracking configuration for reasoning about cleartext storage of sensitive information.
  */
+
 import javascript
 private import semmle.javascript.security.SensitiveActions
 
@@ -35,20 +36,11 @@ module CleartextStorage {
   class Configuration extends TaintTracking::Configuration {
     Configuration() { this = "ClearTextStorage" }
 
-    override
-    predicate isSource(DataFlow::Node source) {
-      source instanceof Source
-    }
+    override predicate isSource(DataFlow::Node source) { source instanceof Source }
 
-    override
-    predicate isSink(DataFlow::Node sink) {
-      sink instanceof Sink
-    }
+    override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
 
-    override
-    predicate isSanitizer(DataFlow::Node node) {
-      node instanceof Sanitizer
-    }
+    override predicate isSanitizer(DataFlow::Node node) { node instanceof Sanitizer }
   }
 
   /**
@@ -58,16 +50,13 @@ module CleartextStorage {
   class SensitiveExprSource extends Source, DataFlow::ValueNode {
     override SensitiveExpr astNode;
 
-    override string describe() {
-      result = astNode.describe()
-    }
+    override string describe() { result = astNode.describe() }
   }
 
   /** A call to any method whose name suggests that it encodes or encrypts the parameter. */
   class ProtectSanitizer extends Sanitizer, DataFlow::ValueNode {
     ProtectSanitizer() {
-      exists(string s |
-        astNode.(CallExpr).getCalleeName().regexpMatch("(?i).*" + s + ".*") |
+      exists(string s | astNode.(CallExpr).getCalleeName().regexpMatch("(?i).*" + s + ".*") |
         s = "protect" or s = "encode" or s = "encrypt"
       )
     }
@@ -78,7 +67,7 @@ module CleartextStorage {
    */
   class CookieStorageSink extends Sink {
     CookieStorageSink() {
-      exists (HTTP::CookieDefinition cookieDef |
+      exists(HTTP::CookieDefinition cookieDef |
         this.asExpr() = cookieDef.getValueArgument() or
         this.asExpr() = cookieDef.getHeaderArgument()
       )
@@ -89,9 +78,7 @@ module CleartextStorage {
    * An expression set as a value of localStorage or sessionStorage.
    */
   class WebStorageSink extends Sink {
-    WebStorageSink() {
-      this.asExpr() instanceof WebStorageWrite
-    }
+    WebStorageSink() { this.asExpr() instanceof WebStorageWrite }
   }
 
   /**
diff --git a/javascript/ql/src/semmle/javascript/security/dataflow/ClientSideUrlRedirect.qll b/javascript/ql/src/semmle/javascript/security/dataflow/ClientSideUrlRedirect.qll
index 8cdc442edaea..4f23dc21466a 100644
--- a/javascript/ql/src/semmle/javascript/security/dataflow/ClientSideUrlRedirect.qll
+++ b/javascript/ql/src/semmle/javascript/security/dataflow/ClientSideUrlRedirect.qll
@@ -27,30 +27,22 @@ module ClientSideUrlRedirect {
    * A flow label for values that represent the URL of the current document, and
    * hence are only partially user-controlled.
    */
-  class DocumentUrl extends DataFlow::FlowLabel {
-    DocumentUrl() { this = "document.url" }
-  }
+  class DocumentUrl extends DataFlow::FlowLabel { DocumentUrl() { this = "document.url" } }
 
   /**
    * A taint-tracking configuration for reasoning about unvalidated URL redirections.
    */
   class Configuration extends TaintTracking::Configuration {
-    Configuration() {
-      this = "ClientSideUrlRedirect"
-    }
+    Configuration() { this = "ClientSideUrlRedirect" }
 
-    override predicate isSource(DataFlow::Node source) {
-      source instanceof Source
-    }
+    override predicate isSource(DataFlow::Node source) { source instanceof Source }
 
     override predicate isSource(DataFlow::Node source, DataFlow::FlowLabel lbl) {
       isDocumentURL(source.asExpr()) and
       lbl instanceof DocumentUrl
     }
 
-    override predicate isSink(DataFlow::Node sink) {
-      sink instanceof Sink
-    }
+    override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
 
     override predicate isSanitizer(DataFlow::Node node) {
       super.isSanitizer(node) or
@@ -61,7 +53,9 @@ module ClientSideUrlRedirect {
       hostnameSanitizingPrefixEdge(source, sink)
     }
 
-    override predicate isAdditionalFlowStep(DataFlow::Node pred, DataFlow::Node succ, DataFlow::FlowLabel f, DataFlow::FlowLabel g) {
+    override predicate isAdditionalFlowStep(
+      DataFlow::Node pred, DataFlow::Node succ, DataFlow::FlowLabel f, DataFlow::FlowLabel g
+    ) {
       queryAccess(pred, succ) and
       f instanceof DocumentUrl and
       g = DataFlow::FlowLabel::taint()
@@ -83,16 +77,18 @@ module ClientSideUrlRedirect {
    * of a URL that flows into `nd` (that is, the part after the `?`).
    */
   private predicate queryAccess(DataFlow::Node nd, DataFlow::Node queryAccess) {
-    exists (string propertyName |
-      queryAccess.asExpr().(PropAccess).accesses(nd.asExpr(), propertyName) |
+    exists(string propertyName |
+      queryAccess.asExpr().(PropAccess).accesses(nd.asExpr(), propertyName)
+    |
       propertyName = "search" or propertyName = "hash"
     )
     or
-    exists (MethodCallExpr mce, string methodName |
-      mce = queryAccess.asExpr() and mce.calls(nd.asExpr(), methodName) |
+    exists(MethodCallExpr mce, string methodName |
+      mce = queryAccess.asExpr() and mce.calls(nd.asExpr(), methodName)
+    |
       methodName = "split" and
       // exclude `location.href.split('?')[0]`, which can never refer to the query string
-      not exists (PropAccess pacc | mce = pacc.getBase() | pacc.getPropertyName() = "0")
+      not exists(PropAccess pacc | mce = pacc.getBase() | pacc.getPropertyName() = "0")
       or
       (methodName = "substring" or methodName = "substr") and
       // exclude `location.href.substring(0, ...)` and similar, which can
@@ -100,7 +96,7 @@ module ClientSideUrlRedirect {
       not mce.getArgument(0).(NumberLiteral).getIntValue() = 0
     )
     or
-    exists (MethodCallExpr mce |
+    exists(MethodCallExpr mce |
       queryAccess.asExpr() = mce and
       mce.calls(any(RegExpLiteral re), "exec") and
       nd.asExpr() = mce.getArgument(0)
@@ -113,46 +109,48 @@ module ClientSideUrlRedirect {
   class LocationSink extends Sink, DataFlow::ValueNode {
     LocationSink() {
       // A call to a `window.navigate` or `window.open`
-      exists (string name |
-        name = "navigate" or name = "open" or
-        name = "openDialog" or name = "showModalDialog" |
+      exists(string name |
+        name = "navigate" or
+        name = "open" or
+        name = "openDialog" or
+        name = "showModalDialog"
+      |
         this = DataFlow::globalVarRef(name).getACall().getArgument(0)
       )
       or
       // A call to `location.replace` or `location.assign`
-      exists (MethodCallExpr locationCall, string name |
+      exists(MethodCallExpr locationCall, string name |
         isLocation(locationCall.getReceiver()) and
         name = locationCall.getMethodName() and
-        astNode = locationCall.getArgument(0) |
+        astNode = locationCall.getArgument(0)
+      |
         name = "replace" or name = "assign"
       )
       or
       // An assignment to `location`
-      exists (Assignment assgn |
-        isLocation(assgn.getTarget()) and astNode = assgn.getRhs()
-      )
+      exists(Assignment assgn | isLocation(assgn.getTarget()) and astNode = assgn.getRhs())
       or
       // An assignment to `location.href`, `location.protocol` or `location.hostname`
       exists(DataFlow::PropWrite pw, string propName |
-        isLocation(pw.getBase().asExpr()) and propName = pw.getPropertyName() and
-        this = pw.getRhs() |
+        isLocation(pw.getBase().asExpr()) and
+        propName = pw.getPropertyName() and
+        this = pw.getRhs()
+      |
         propName = "href" or propName = "protocol" or propName = "hostname"
       )
       or
       // A redirection using the AngularJS `$location` service
-      exists (AngularJS::ServiceReference service |
+      exists(AngularJS::ServiceReference service |
         service.getName() = "$location" and
         this.asExpr() = service.getAMethodCall("url").getArgument(0)
       )
     }
   }
 
-
   /**
    * An expression that may be interpreted as the URL of a script.
    */
-  abstract class ScriptUrlSink extends Sink {
-  }
+  abstract class ScriptUrlSink extends Sink { }
 
   /**
    * An argument expression to `new Worker(...)`, viewed as
@@ -169,7 +167,7 @@ module ClientSideUrlRedirect {
    */
   class SrcAttributeUrlSink extends ScriptUrlSink, DataFlow::ValueNode {
     SrcAttributeUrlSink() {
-      exists (DOM::AttributeDefinition attr, string eltName |
+      exists(DOM::AttributeDefinition attr, string eltName |
         attr.getElement().getName() = eltName and
         (eltName = "script" or eltName = "iframe") and
         attr.getName() = "src" and
diff --git a/javascript/ql/src/semmle/javascript/security/dataflow/CodeInjection.qll b/javascript/ql/src/semmle/javascript/security/dataflow/CodeInjection.qll
index 4cd7bab37394..6dc90cb839aa 100644
--- a/javascript/ql/src/semmle/javascript/security/dataflow/CodeInjection.qll
+++ b/javascript/ql/src/semmle/javascript/security/dataflow/CodeInjection.qll
@@ -27,13 +27,9 @@ module CodeInjection {
   class Configuration extends TaintTracking::Configuration {
     Configuration() { this = "CodeInjection" }
 
-    override predicate isSource(DataFlow::Node source) {
-      source instanceof Source
-    }
+    override predicate isSource(DataFlow::Node source) { source instanceof Source }
 
-    override predicate isSink(DataFlow::Node sink) {
-      sink instanceof Sink
-    }
+    override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
 
     override predicate isSanitizer(DataFlow::Node node) {
       super.isSanitizer(node) or
@@ -56,9 +52,7 @@ module CodeInjection {
    * An access to a property that may hold (parts of) the document URL.
    */
   class LocationSource extends Source, DataFlow::ValueNode {
-    LocationSource() {
-      isDocumentURL(astNode)
-    }
+    LocationSource() { isDocumentURL(astNode) }
   }
 
   /**
@@ -71,42 +65,45 @@ module CodeInjection {
   }
 
   /**
-   * An expression which may be evaluated as JavaScript in NodeJS using the 
+   * An expression which may be evaluated as JavaScript in NodeJS using the
    * `vm` module.
    */
   class NodeJSVmSink extends Sink, DataFlow::ValueNode {
-    NodeJSVmSink() {
-      exists(NodeJSLib::VmModuleMethodCall call | 
-        this = call.getACodeArgument()
-      )
-    }
+    NodeJSVmSink() { exists(NodeJSLib::VmModuleMethodCall call | this = call.getACodeArgument()) }
   }
-  
+
   /**
    * An expression which may be evaluated as JavaScript.
    */
   class EvalJavaScriptSink extends Sink, DataFlow::ValueNode {
     EvalJavaScriptSink() {
-      exists (DataFlow::InvokeNode c, int index |
-        exists (string callName |
-          c = DataFlow::globalVarRef(callName).getAnInvocation() |
-          callName = "eval" and index = 0 or
-          callName = "Function" or
-          callName = "execScript" and index = 0 or
-          callName = "executeJavaScript" and index = 0 or
-          callName = "execCommand" and index = 0 or
-          callName = "setTimeout" and index = 0 or
-          callName = "setInterval" and index = 0 or
+      exists(DataFlow::InvokeNode c, int index |
+        exists(string callName | c = DataFlow::globalVarRef(callName).getAnInvocation() |
+          callName = "eval" and index = 0
+          or
+          callName = "Function"
+          or
+          callName = "execScript" and index = 0
+          or
+          callName = "executeJavaScript" and index = 0
+          or
+          callName = "execCommand" and index = 0
+          or
+          callName = "setTimeout" and index = 0
+          or
+          callName = "setInterval" and index = 0
+          or
           callName = "setImmediate" and index = 0
         )
         or
-        exists (DataFlow::GlobalVarRefNode wasm, string methodName |
-          wasm.getName() = "WebAssembly" and c = wasm.getAMemberCall(methodName) |
+        exists(DataFlow::GlobalVarRefNode wasm, string methodName |
+          wasm.getName() = "WebAssembly" and c = wasm.getAMemberCall(methodName)
+        |
           methodName = "compile" or
           methodName = "compileStreaming"
         )
       |
-      this = c.getArgument(index)
+        this = c.getArgument(index)
       )
     }
   }
@@ -116,7 +113,7 @@ module CodeInjection {
    */
   class WebViewInjectedJavaScriptSink extends Sink {
     WebViewInjectedJavaScriptSink() {
-      exists (ReactNative::WebViewElement webView |
+      exists(ReactNative::WebViewElement webView |
         // `injectedJavaScript` property of React Native `WebView`
         this = webView.getAPropertyWrite("injectedJavaScript").getRhs()
         or
diff --git a/javascript/ql/src/semmle/javascript/security/dataflow/CommandInjection.qll b/javascript/ql/src/semmle/javascript/security/dataflow/CommandInjection.qll
index 93ddc307ed3b..09c8ed3008b0 100644
--- a/javascript/ql/src/semmle/javascript/security/dataflow/CommandInjection.qll
+++ b/javascript/ql/src/semmle/javascript/security/dataflow/CommandInjection.qll
@@ -15,8 +15,7 @@ module CommandInjection {
   /**
    * A data flow sink for command-injection vulnerabilities.
    */
-  abstract class Sink extends DataFlow::Node {
-  }
+  abstract class Sink extends DataFlow::Node { }
 
   /**
    * A sanitizer for command-injection vulnerabilities.
@@ -29,9 +28,7 @@ module CommandInjection {
   class Configuration extends TaintTracking::Configuration {
     Configuration() { this = "CommandInjection" }
 
-    override predicate isSource(DataFlow::Node source) {
-      source instanceof Source
-    }
+    override predicate isSource(DataFlow::Node source) { source instanceof Source }
 
     /**
      * Holds if `sink` is a data flow sink for command-injection vulnerabilities, and
@@ -43,13 +40,9 @@ module CommandInjection {
       indirectCommandInjection(sink, highlight)
     }
 
-    override predicate isSink(DataFlow::Node sink) {
-      isSinkWithHighlight(sink, _)
-    }
+    override predicate isSink(DataFlow::Node sink) { isSinkWithHighlight(sink, _) }
 
-    override predicate isSanitizer(DataFlow::Node node) {
-      node instanceof Sanitizer
-    }
+    override predicate isSanitizer(DataFlow::Node node) { node instanceof Sanitizer }
   }
 
   /** A source of remote user input, considered as a flow source for command injection. */
@@ -59,11 +52,9 @@ module CommandInjection {
 
   /**
    * A command argument to a function that initiates an operating system command.
-  */
+   */
   class SystemCommandExecutionSink extends Sink, DataFlow::ValueNode {
-    SystemCommandExecutionSink() {
-      this = any(SystemCommandExecution sys).getACommandArgument()
-    }
+    SystemCommandExecutionSink() { this = any(SystemCommandExecution sys).getACommandArgument() }
   }
 
   /**
@@ -77,13 +68,11 @@ module CommandInjection {
     override predicate isSource(DataFlow::Node nd) {
       nd instanceof DataFlow::ArrayCreationNode
       or
-      exists (ConstantString shell | shellCmd(shell, _) |
-        nd = DataFlow::valueNode(shell)
-      )
+      exists(ConstantString shell | shellCmd(shell, _) | nd = DataFlow::valueNode(shell))
     }
 
     override predicate isSink(DataFlow::Node nd) {
-      exists (SystemCommandExecution sys |
+      exists(SystemCommandExecution sys |
         nd = sys.getACommandArgument() or
         nd = sys.getArgumentList()
       )
@@ -97,15 +86,13 @@ module CommandInjection {
    * `arg` is `"-c"`, or `shell` is `cmd.exe` and `arg` is `"/c"`.
    */
   private predicate shellCmd(ConstantString shell, string arg) {
-    exists (string s | s = shell.getStringValue() |
-      (s = "sh" or s = "bash" or s = "/bin/sh" or s = "/bin/bash")
-      and
+    exists(string s | s = shell.getStringValue() |
+      (s = "sh" or s = "bash" or s = "/bin/sh" or s = "/bin/bash") and
       arg = "-c"
     )
     or
-    exists (string s | s = shell.getStringValue().toLowerCase() |
-      (s = "cmd" or s = "cmd.exe")
-      and
+    exists(string s | s = shell.getStringValue().toLowerCase() |
+      (s = "cmd" or s = "cmd.exe") and
       (arg = "/c" or arg = "/C")
     )
   }
@@ -125,8 +112,9 @@ module CommandInjection {
    * we want to report the `spawn` call as the sink, so we bind it to `sys`.
    */
   private predicate indirectCommandInjection(DataFlow::Node sink, SystemCommandExecution sys) {
-    exists (ArgumentListTracking cfg, DataFlow::ArrayCreationNode args,
-            ConstantString shell, string dashC |
+    exists(
+      ArgumentListTracking cfg, DataFlow::ArrayCreationNode args, ConstantString shell, string dashC
+    |
       shellCmd(shell, dashC) and
       cfg.hasFlow(DataFlow::valueNode(shell), sys.getACommandArgument()) and
       cfg.hasFlow(args, sys.getArgumentList()) and
diff --git a/javascript/ql/src/semmle/javascript/security/dataflow/ConditionalBypass.qll b/javascript/ql/src/semmle/javascript/security/dataflow/ConditionalBypass.qll
index 3d19326dbd9a..cc5ad81fb14e 100644
--- a/javascript/ql/src/semmle/javascript/security/dataflow/ConditionalBypass.qll
+++ b/javascript/ql/src/semmle/javascript/security/dataflow/ConditionalBypass.qll
@@ -1,6 +1,7 @@
 /**
  * Provides a taint tracking configuration for reasoning about bypass of sensitive action guards.
  */
+
 import javascript
 private import semmle.javascript.security.SensitiveActions
 
@@ -18,7 +19,6 @@ module ConditionalBypass {
      * Gets the guarded sensitive action.
      */
     abstract SensitiveAction getAction();
-
   }
 
   /**
@@ -32,24 +32,16 @@ module ConditionalBypass {
   class Configuration extends TaintTracking::Configuration {
     Configuration() { this = "ConditionalBypass" }
 
-    override
-    predicate isSource(DataFlow::Node source) {
-      source instanceof Source
-    }
+    override predicate isSource(DataFlow::Node source) { source instanceof Source }
 
-    override
-    predicate isSink(DataFlow::Node sink) {
-      sink instanceof Sink
-    }
+    override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
 
-    override
-    predicate isSanitizer(DataFlow::Node node) {
+    override predicate isSanitizer(DataFlow::Node node) {
       super.isSanitizer(node) or
       node instanceof Sanitizer
     }
 
-    override
-    predicate isAdditionalTaintStep(DataFlow::Node src, DataFlow::Node dst) {
+    override predicate isAdditionalTaintStep(DataFlow::Node src, DataFlow::Node dst) {
       // comparing a tainted expression against a constant gives a tainted result
       dst.asExpr().(Comparison).hasOperands(src.asExpr(), any(ConstantExpr c))
     }
@@ -69,7 +61,7 @@ module ConditionalBypass {
   private predicate dominatesSensitiveAction(ReachableBasicBlock bb, SensitiveAction action) {
     bb = action.getBasicBlock()
     or
-    exists (ReachableBasicBlock mid |
+    exists(ReachableBasicBlock mid |
       dominatesSensitiveAction(mid, action) and
       bb = mid.getImmediateDominator()
     )
@@ -79,20 +71,16 @@ module ConditionalBypass {
    * A conditional that guards a sensitive action, e.g. `ok` in `if (ok) login()`.
    */
   class SensitiveActionGuardConditional extends Sink {
-
     SensitiveAction action;
 
     SensitiveActionGuardConditional() {
-      exists (GuardControlFlowNode guard |
+      exists(GuardControlFlowNode guard |
         this.asExpr() = guard.getTest() and
         dominatesSensitiveAction(guard.getBasicBlock(), action)
       )
     }
 
-    override SensitiveAction getAction() {
-      result = action
-    }
-
+    override SensitiveAction getAction() { result = action }
   }
 }
 
diff --git a/javascript/ql/src/semmle/javascript/security/dataflow/CorsMisconfigurationForCredentials.qll b/javascript/ql/src/semmle/javascript/security/dataflow/CorsMisconfigurationForCredentials.qll
index c6e18ec51c80..184c0490ed5b 100644
--- a/javascript/ql/src/semmle/javascript/security/dataflow/CorsMisconfigurationForCredentials.qll
+++ b/javascript/ql/src/semmle/javascript/security/dataflow/CorsMisconfigurationForCredentials.qll
@@ -1,6 +1,7 @@
 /**
  * Provides a dataflow taint tracking configuration for reasoning about CORS misconfiguration for credentials transfer.
  */
+
 import javascript
 
 module CorsMisconfigurationForCredentials {
@@ -13,12 +14,10 @@ module CorsMisconfigurationForCredentials {
    * A data flow sink for CORS misconfiguration for credentials transfer.
    */
   abstract class Sink extends DataFlow::Node {
-
     /**
      * Gets the "Access-Control-Allow-Credentials" header definition.
      */
     abstract HTTP::HeaderDefinition getCredentialsHeader();
-
   }
 
   /**
@@ -30,22 +29,13 @@ module CorsMisconfigurationForCredentials {
    * A data flow configuration for CORS misconfiguration for credentials transfer.
    */
   class Configuration extends TaintTracking::Configuration {
-    Configuration() {
-      this = "CorsMisconfigurationForCredentials"
-    }
+    Configuration() { this = "CorsMisconfigurationForCredentials" }
 
-    override
-    predicate isSource(DataFlow::Node source) {
-      source instanceof Source
-    }
+    override predicate isSource(DataFlow::Node source) { source instanceof Source }
 
-    override
-    predicate isSink(DataFlow::Node sink) {
-      sink instanceof Sink
-    }
+    override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
 
-    override
-    predicate isSanitizer(DataFlow::Node node) {
+    override predicate isSanitizer(DataFlow::Node node) {
       super.isSanitizer(node) or
       node instanceof Sanitizer
     }
@@ -53,7 +43,6 @@ module CorsMisconfigurationForCredentials {
     override predicate isSanitizerGuard(TaintTracking::SanitizerGuardNode guard) {
       guard instanceof TaintTracking::AdHocWhitelistCheckSanitizer
     }
-
   }
 
   /** A source of remote user input, considered as a flow source for CORS misconfiguration. */
@@ -67,24 +56,24 @@ module CorsMisconfigurationForCredentials {
    * HTTP header with a truthy value.
    */
   class CorsOriginHeaderWithAssociatedCredentialHeader extends Sink, DataFlow::ValueNode {
-
     HTTP::ExplicitHeaderDefinition credentials;
 
     CorsOriginHeaderWithAssociatedCredentialHeader() {
-      exists (HTTP::RouteHandler routeHandler, HTTP::ExplicitHeaderDefinition origin, Expr credentialsValue |
+      exists(
+        HTTP::RouteHandler routeHandler, HTTP::ExplicitHeaderDefinition origin,
+        Expr credentialsValue
+      |
         routeHandler.getAResponseHeader(_) = origin and
         routeHandler.getAResponseHeader(_) = credentials and
         origin.definesExplicitly("access-control-allow-origin", this.asExpr()) and
-        credentials.definesExplicitly("access-control-allow-credentials", credentialsValue) |
+        credentials.definesExplicitly("access-control-allow-credentials", credentialsValue)
+      |
         credentialsValue.mayHaveBooleanValue(true) or
         credentialsValue.mayHaveStringValue("true")
       )
     }
 
-    override HTTP::HeaderDefinition getCredentialsHeader() {
-      result = credentials
-    }
-
+    override HTTP::HeaderDefinition getCredentialsHeader() { result = credentials }
   }
 
   /**
@@ -100,13 +89,16 @@ module CorsMisconfigurationForCredentials {
 }
 
 /** DEPRECATED: Use `CorsMisconfigurationForCredentials::Source` instead. */
-deprecated class CorsMisconfigurationForCredentialsSource = CorsMisconfigurationForCredentials::Source;
+deprecated class CorsMisconfigurationForCredentialsSource =
+  CorsMisconfigurationForCredentials::Source;
 
 /** DEPRECATED: Use `CorsMisconfigurationForCredentials::Sink` instead. */
 deprecated class CorsMisconfigurationForCredentialsSink = CorsMisconfigurationForCredentials::Sink;
 
 /** DEPRECATED: Use `CorsMisconfigurationForCredentials::Sanitizer` instead. */
-deprecated class CorsMisconfigurationForCredentialsSanitizer = CorsMisconfigurationForCredentials::Sanitizer;
+deprecated class CorsMisconfigurationForCredentialsSanitizer =
+  CorsMisconfigurationForCredentials::Sanitizer;
 
 /** DEPRECATED: Use `CorsMisconfigurationForCredentials::Configuration` instead. */
-deprecated class CorsMisconfigurationForCredentialsDataFlowConfiguration = CorsMisconfigurationForCredentials::Configuration;
+deprecated class CorsMisconfigurationForCredentialsDataFlowConfiguration =
+  CorsMisconfigurationForCredentials::Configuration;
diff --git a/javascript/ql/src/semmle/javascript/security/dataflow/DOM.qll b/javascript/ql/src/semmle/javascript/security/dataflow/DOM.qll
index 604721c21efe..48da56d6a13f 100644
--- a/javascript/ql/src/semmle/javascript/security/dataflow/DOM.qll
+++ b/javascript/ql/src/semmle/javascript/security/dataflow/DOM.qll
@@ -6,25 +6,26 @@ import javascript
 
 /** Holds if `tp` is one of the roots of the DOM type hierarchy. */
 predicate isDomRootType(ExternalType tp) {
-  exists (string qn | qn = tp.getQualifiedName() | qn = "EventTarget" or qn = "StyleSheet")
+  exists(string qn | qn = tp.getQualifiedName() | qn = "EventTarget" or qn = "StyleSheet")
 }
 
 /** A global variable whose declared type extends a DOM root type. */
 class DOMGlobalVariable extends GlobalVariable {
   DOMGlobalVariable() {
-    exists (ExternalVarDecl d | d.getQualifiedName() = this.getName() |
+    exists(ExternalVarDecl d | d.getQualifiedName() = this.getName() |
       isDomRootType(d.getTypeTag().getTypeDeclaration().getASupertype*())
     )
   }
 }
 
 private DataFlow::SourceNode domElementCollection() {
-  exists (string collectionName |
+  exists(string collectionName |
     collectionName = "getElementsByClassName" or
     collectionName = "getElementsByName" or
     collectionName = "getElementsByTagName" or
     collectionName = "getElementsByTagNameNS" or
-    collectionName = "querySelectorAll" |
+    collectionName = "querySelectorAll"
+  |
     (
       result = document().getAMethodCall(collectionName) or
       result = DataFlow::globalVarRef(collectionName).getACall()
@@ -33,11 +34,12 @@ private DataFlow::SourceNode domElementCollection() {
 }
 
 private DataFlow::SourceNode domElementCreationOrQuery() {
-  exists (string methodName |
+  exists(string methodName |
     methodName = "createElement" or
     methodName = "createElementNS" or
     methodName = "getElementById" or
-    methodName = "querySelector" |
+    methodName = "querySelector"
+  |
     result = document().getAMethodCall(methodName) or
     result = DataFlow::globalVarRef(methodName).getACall()
   )
@@ -51,9 +53,7 @@ private DataFlow::SourceNode domValueSource() {
 }
 
 /** Holds if `e` could hold a value that comes from the DOM. */
-predicate isDomValue(Expr e) {
-  domValueSource().flowsToExpr(e)
-}
+predicate isDomValue(Expr e) { domValueSource().flowsToExpr(e) }
 
 /** Holds if `e` could refer to the `location` property of a DOM node. */
 predicate isLocation(Expr e) {
@@ -64,24 +64,22 @@ predicate isLocation(Expr e) {
 /**
  * Gets a reference to the 'document' object.
  */
-DataFlow::SourceNode document() {
-  result = DataFlow::globalVarRef("document")
-}
+DataFlow::SourceNode document() { result = DataFlow::globalVarRef("document") }
 
 /** Holds if `e` could refer to the `document` object. */
-predicate isDocument(Expr e) {
-  document().flowsToExpr(e)
-}
+predicate isDocument(Expr e) { document().flowsToExpr(e) }
 
 /** Holds if `e` could refer to the document URL. */
 predicate isDocumentURL(Expr e) {
-  exists (Expr base, string propName | e.(PropAccess).accesses(base, propName) |
+  exists(Expr base, string propName | e.(PropAccess).accesses(base, propName) |
     isDocument(base) and
-    (propName = "documentURI" or
-     propName = "documentURIObject" or
-     propName = "location" or
-     propName = "referrer" or
-     propName = "URL")
+    (
+      propName = "documentURI" or
+      propName = "documentURIObject" or
+      propName = "location" or
+      propName = "referrer" or
+      propName = "URL"
+    )
     or
     isDomValue(base) and propName = "baseUri"
   )
@@ -95,8 +93,7 @@ predicate isDocumentURL(Expr e) {
  * `href`, `hash` and `search`.
  */
 predicate isSafeLocationProperty(PropAccess pacc) {
-  exists (Expr loc, string prop |
-    isLocation(loc) and pacc.accesses(loc, prop) |
+  exists(Expr loc, string prop | isLocation(loc) and pacc.accesses(loc, prop) |
     prop != "href" and prop != "hash" and prop != "search"
   )
 }
@@ -105,25 +102,31 @@ predicate isSafeLocationProperty(PropAccess pacc) {
  * A call to a DOM method.
  */
 class DomMethodCallExpr extends MethodCallExpr {
-  DomMethodCallExpr() {
-    isDomValue(getReceiver())
-  }
+  DomMethodCallExpr() { isDomValue(getReceiver()) }
 
   /**
    * Holds if `arg` is an argument that is interpreted as HTML.
    */
-  predicate interpretsArgumentsAsHTML(Expr arg){
-    exists (int argPos, string name |
+  predicate interpretsArgumentsAsHTML(Expr arg) {
+    exists(int argPos, string name |
       arg = getArgument(argPos) and
-      name = getMethodName() |
+      name = getMethodName()
+    |
       // individual signatures:
-      name = "write" or
-      name = "writeln" or
-      name = "insertAdjacentHTML" and argPos = 0 or
-      name = "insertAdjacentElement" and argPos = 0 or
-      name = "insertBefore" and argPos = 0 or
-      name = "createElement" and argPos = 0 or
-      name = "appendChild" and argPos = 0 or
+      name = "write"
+      or
+      name = "writeln"
+      or
+      name = "insertAdjacentHTML" and argPos = 0
+      or
+      name = "insertAdjacentElement" and argPos = 0
+      or
+      name = "insertBefore" and argPos = 0
+      or
+      name = "createElement" and argPos = 0
+      or
+      name = "appendChild" and argPos = 0
+      or
       name = "setAttribute" and argPos = 0
     )
   }
@@ -133,10 +136,9 @@ class DomMethodCallExpr extends MethodCallExpr {
  * An assignment to a property of a DOM object.
  */
 class DomPropWriteNode extends Assignment {
-
   PropAccess lhs;
 
-  DomPropWriteNode (){
+  DomPropWriteNode() {
     lhs = getLhs() and
     isDomValue(lhs.getBase())
   }
@@ -144,7 +146,7 @@ class DomPropWriteNode extends Assignment {
   /**
    * Holds if the assigned value is interpreted as HTML.
    */
-  predicate interpretsValueAsHTML(){
+  predicate interpretsValueAsHTML() {
     lhs.getPropertyName() = "innerHTML" or
     lhs.getPropertyName() = "outerHTML"
   }
@@ -154,10 +156,11 @@ class DomPropWriteNode extends Assignment {
  * A value written to web storage, like `localStorage` or `sessionStorage`.
  */
 class WebStorageWrite extends Expr {
-  WebStorageWrite(){
-    exists (DataFlow::SourceNode webStorage |
+  WebStorageWrite() {
+    exists(DataFlow::SourceNode webStorage |
       webStorage = DataFlow::globalVarRef("localStorage") or
-      webStorage = DataFlow::globalVarRef("sessionStorage") |
+      webStorage = DataFlow::globalVarRef("sessionStorage")
+    |
       // an assignment to `window.localStorage[someProp]`
       this = webStorage.getAPropertyWrite().getRhs().asExpr()
       or
@@ -205,12 +208,13 @@ private module PersistentWebStorage {
     override DataFlow::Node getValue() { result = getArgument(1) }
   }
 }
+
 /**
  * An event handler that handles `postMessage` events.
  */
 class PostMessageEventHandler extends Function {
   PostMessageEventHandler() {
-    exists (CallExpr addEventListener |
+    exists(CallExpr addEventListener |
       addEventListener.getCallee().accessesGlobal("addEventListener") and
       addEventListener.getArgument(0).mayHaveStringValue("message") and
       addEventListener.getArgument(1).analyze().getAValue().(AbstractFunction).getFunction() = this
@@ -220,9 +224,7 @@ class PostMessageEventHandler extends Function {
   /**
    * Gets the parameter that contains the event.
    */
-  SimpleParameter getEventParameter() {
-    result = getParameter(0)
-  }
+  SimpleParameter getEventParameter() { result = getParameter(0) }
 }
 
 /**
@@ -234,9 +236,7 @@ private class PostMessageEventParameter extends RemoteFlowSource {
     this = DataFlow::parameterNode(any(PostMessageEventHandler pmeh).getEventParameter())
   }
 
-  override string getSourceType() {
-    result = "postMessage event"
-  }
+  override string getSourceType() { result = "postMessage event" }
 }
 
 /**
@@ -251,10 +251,9 @@ private class WindowNameAccess extends RemoteFlowSource {
     this.accessesGlobal("name") and
     not exists(VarDef def |
       def.getAVariable().(GlobalVariable).getName() = "name" and
-      def.getContainer() = this.asExpr().getContainer())
+      def.getContainer() = this.asExpr().getContainer()
+    )
   }
 
-  override string getSourceType() {
-    result = "Window name"
-  }
+  override string getSourceType() { result = "Window name" }
 }
diff --git a/javascript/ql/src/semmle/javascript/security/dataflow/DifferentKindsComparisonBypass.qll b/javascript/ql/src/semmle/javascript/security/dataflow/DifferentKindsComparisonBypass.qll
index 9dbb1b0825e4..b43838a65ebb 100644
--- a/javascript/ql/src/semmle/javascript/security/dataflow/DifferentKindsComparisonBypass.qll
+++ b/javascript/ql/src/semmle/javascript/security/dataflow/DifferentKindsComparisonBypass.qll
@@ -1,21 +1,19 @@
 /**
  * Provides classes for reasoning about comparisons that relies on different kinds of HTTP request data.
  */
+
 import javascript
 import semmle.javascript.security.dataflow.RemoteFlowSources
 
 module DifferentKindsComparisonBypass {
-
   /**
    * A data flow source for comparisons that relies on different kinds of HTTP request data.
    */
   abstract class Source extends DataFlow::Node {
-
     /**
      * Holds if it suspicious to compare this source with `other`.
      */
     abstract predicate isSuspiciousToCompareWith(Source other);
-
   }
 
   /**
@@ -32,17 +30,11 @@ module DifferentKindsComparisonBypass {
    * A taint tracking configuration for comparisons that relies on different kinds of HTTP request data.
    */
   private class Configuration extends TaintTracking::Configuration {
-    Configuration() {
-      this = "DifferentKindsComparisonBypass"
-    }
+    Configuration() { this = "DifferentKindsComparisonBypass" }
 
-    override predicate isSource(DataFlow::Node source) {
-      source instanceof Source
-    }
+    override predicate isSource(DataFlow::Node source) { source instanceof Source }
 
-    override predicate isSink(DataFlow::Node sink) {
-      sink instanceof Sink
-    }
+    override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
 
     override predicate isSanitizer(DataFlow::Node node) {
       super.isSanitizer(node) or
@@ -54,12 +46,9 @@ module DifferentKindsComparisonBypass {
    * A HTTP request input that is suspicious to compare with another HTTP request input of a different kind.
    */
   class RequestInputComparisonSource extends Source {
-
     HTTP::RequestInputAccess input;
 
-    RequestInputComparisonSource() {
-      input = this
-    }
+    RequestInputComparisonSource() { input = this }
 
     override predicate isSuspiciousToCompareWith(Source other) {
       input.getKind() != other.(RequestInputComparisonSource).getInput().getKind()
@@ -68,34 +57,26 @@ module DifferentKindsComparisonBypass {
     /**
      * Gets the HTTP request input of this source.
      */
-    private HTTP::RequestInputAccess getInput() {
-      result = input
-    }
-
+    private HTTP::RequestInputAccess getInput() { result = input }
   }
 
   /**
    * A data flow sink for a potential suspicious comparisons.
    */
   private class ComparisonOperandSink extends Sink {
-
-    ComparisonOperandSink() {
-      asExpr() = any(Comparison c).getAnOperand()
-    }
-
+    ComparisonOperandSink() { asExpr() = any(Comparison c).getAnOperand() }
   }
 
   /**
    * A comparison that relies on different kinds of HTTP request data.
    */
   class DifferentKindsComparison extends Comparison {
-
     Source lSource;
 
     Source rSource;
 
     DifferentKindsComparison() {
-      exists (Configuration cfg |
+      exists(Configuration cfg |
         cfg.hasFlow(lSource, DataFlow::valueNode(getLeftOperand())) and
         cfg.hasFlow(rSource, DataFlow::valueNode(getRightOperand())) and
         lSource.isSuspiciousToCompareWith(rSource)
@@ -103,15 +84,9 @@ module DifferentKindsComparisonBypass {
     }
 
     /** Gets the left operand source of this comparison. */
-    Source getLSource() {
-      result = lSource
-    }
+    Source getLSource() { result = lSource }
 
     /** Gets the right operand source of this comparison. */
-    Source getRSource() {
-      result = rSource
-    }
-
+    Source getRSource() { result = rSource }
   }
-
-}
\ No newline at end of file
+}
diff --git a/javascript/ql/src/semmle/javascript/security/dataflow/DomBasedXss.qll b/javascript/ql/src/semmle/javascript/security/dataflow/DomBasedXss.qll
index 6e7635821ccd..a3db0210aedf 100644
--- a/javascript/ql/src/semmle/javascript/security/dataflow/DomBasedXss.qll
+++ b/javascript/ql/src/semmle/javascript/security/dataflow/DomBasedXss.qll
@@ -23,9 +23,7 @@ module DomBasedXss {
      * Defaults to `Cross-site scripting`, but may be overriden for sinks
      * that do not allow script injection, but injection of other undesirable HTML elements.
      */
-    string getVulnerabilityKind() {
-      result = "Cross-site scripting"
-    }
+    string getVulnerabilityKind() { result = "Cross-site scripting" }
   }
 
   /**
@@ -39,23 +37,22 @@ module DomBasedXss {
   class Configuration extends TaintTracking::Configuration {
     Configuration() { this = "DomBasedXss" }
 
-    override predicate isSource(DataFlow::Node source) {
-      source instanceof Source
-    }
+    override predicate isSource(DataFlow::Node source) { source instanceof Source }
 
-    override predicate isSink(DataFlow::Node sink) {
-      sink instanceof Sink
-    }
+    override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
 
     override predicate isSanitizer(DataFlow::Node node) {
-      super.isSanitizer(node) or
-      exists (PropAccess pacc | pacc = node.asExpr() |
-        isSafeLocationProperty(pacc) or
+      super.isSanitizer(node)
+      or
+      exists(PropAccess pacc | pacc = node.asExpr() |
+        isSafeLocationProperty(pacc)
+        or
         // `$(location.hash)` is a fairly common and safe idiom
         // (because `location.hash` always starts with `#`),
         // so we mark `hash` as safe for the purposes of this query
         pacc.getPropertyName() = "hash"
-      ) or
+      )
+      or
       node instanceof Sanitizer
     }
   }
@@ -69,9 +66,7 @@ module DomBasedXss {
    * An access of the URL of this page, or of the referrer to this page.
    */
   class LocationSource extends Source, DataFlow::ValueNode {
-    LocationSource() {
-      isDocumentURL(astNode)
-    }
+    LocationSource() { isDocumentURL(astNode) }
   }
 
   /**
@@ -87,7 +82,7 @@ module DomBasedXss {
         or
         // or it doesn't start with something other than `<`, and so at least
         // _may_ be interpreted as HTML
-        not exists (DataFlow::Node prefix, string strval |
+        not exists(DataFlow::Node prefix, string strval |
           isPrefixOfJQueryHtmlString(astNode, prefix) and
           strval = prefix.asExpr().getStringValue() and
           not strval.regexpMatch("\\s*<.*")
@@ -99,8 +94,9 @@ module DomBasedXss {
       any(AngularJS::AngularJSCall call).interpretsArgumentAsHtml(this.asExpr())
       or
       // call to a WinJS function that interprets its argument as HTML
-      exists (DataFlow::MethodCallNode mcn, string m |
-        m = "setInnerHTMLUnsafe" or m = "setOuterHTMLUnsafe" |
+      exists(DataFlow::MethodCallNode mcn, string m |
+        m = "setInnerHTMLUnsafe" or m = "setOuterHTMLUnsafe"
+      |
         mcn.getMethodName() = m and
         this = mcn.getArgument(1)
       )
@@ -115,7 +111,7 @@ module DomBasedXss {
     any(JQueryMethodCall call).interpretsArgumentAsHtml(htmlString) and
     prefix = htmlString.flow()
     or
-    exists (DataFlow::Node pred | isPrefixOfJQueryHtmlString(htmlString, pred) |
+    exists(DataFlow::Node pred | isPrefixOfJQueryHtmlString(htmlString, pred) |
       prefix = StringConcatenation::getFirstOperand(pred)
       or
       prefix = pred.getAPredecessor()
@@ -132,15 +128,16 @@ module DomBasedXss {
       any(DomMethodCallExpr call).interpretsArgumentsAsHTML(this.asExpr())
       or
       // Assignment to a dangerous DOM property
-      exists (DomPropWriteNode pw |
+      exists(DomPropWriteNode pw |
         pw.interpretsValueAsHTML() and
         this = DataFlow::valueNode(pw.getRhs())
       )
       or
       // `html` or `source.html` properties of React Native `WebView`
-      exists (ReactNative::WebViewElement webView, DataFlow::SourceNode source |
+      exists(ReactNative::WebViewElement webView, DataFlow::SourceNode source |
         source = webView or
-        source = webView.getAPropertyWrite("source").getRhs().getALocalSource() |
+        source = webView.getAPropertyWrite("source").getRhs().getALocalSource()
+      |
         this = source.getAPropertyWrite("html").getRhs()
       )
     }
@@ -151,7 +148,7 @@ module DomBasedXss {
    */
   class DomParserSink extends Sink {
     DomParserSink() {
-      exists (DataFlow::GlobalVarRefNode domParser |
+      exists(DataFlow::GlobalVarRefNode domParser |
         domParser.getName() = "DOMParser" and
         this = domParser.getAnInstantiation().getAMethodCall("parseFromString").getArgument(0)
       )
@@ -166,16 +163,17 @@ module DomBasedXss {
    */
   class DangerouslySetInnerHtmlSink extends Sink, DataFlow::ValueNode {
     DangerouslySetInnerHtmlSink() {
-      exists (DataFlow::Node danger, DataFlow::SourceNode valueSrc |
-        exists (JSXAttribute attr |
+      exists(DataFlow::Node danger, DataFlow::SourceNode valueSrc |
+        exists(JSXAttribute attr |
           attr.getName() = "dangerouslySetInnerHTML" and
           attr.getValue() = danger.asExpr()
         )
         or
-        exists (ReactElementDefinition def, DataFlow::ObjectLiteralNode props |
+        exists(ReactElementDefinition def, DataFlow::ObjectLiteralNode props |
           props.flowsTo(def.getProps()) and
           props.hasPropertyWrite("dangerouslySetInnerHTML", danger)
-        ) |
+        )
+      |
         valueSrc.flowsTo(danger) and
         valueSrc.hasPropertyWrite("__html", this)
       )
@@ -186,13 +184,9 @@ module DomBasedXss {
    * The HTML body of an email, viewed as an XSS sink.
    */
   class EmailHtmlBodySink extends Sink {
-    EmailHtmlBodySink() {
-      this = any(EmailSender sender).getHtmlBody()
-    }
+    EmailHtmlBodySink() { this = any(EmailSender sender).getHtmlBody() }
 
-    override string getVulnerabilityKind() {
-      result = "HTML injection"
-    }
+    override string getVulnerabilityKind() { result = "HTML injection" }
   }
 }
 
diff --git a/javascript/ql/src/semmle/javascript/security/dataflow/FileAccessToHttp.qll b/javascript/ql/src/semmle/javascript/security/dataflow/FileAccessToHttp.qll
index 449ec25780ff..b24db9fe0e35 100644
--- a/javascript/ql/src/semmle/javascript/security/dataflow/FileAccessToHttp.qll
+++ b/javascript/ql/src/semmle/javascript/security/dataflow/FileAccessToHttp.qll
@@ -1,11 +1,11 @@
 /**
  * Provides a taint tracking configuration for reasoning about file data in outbound network requests.
  */
+
 import javascript
 import semmle.javascript.security.dataflow.RemoteFlowSources
 
 module FileAccessToHttp {
-
   /**
    * A data flow source for file data in outbound network requests.
    */
@@ -25,17 +25,11 @@ module FileAccessToHttp {
    * A taint tracking configuration for file data in outbound network requests.
    */
   class Configuration extends TaintTracking::Configuration {
-    Configuration() {
-      this = "FileAccessToHttp"
-    }
+    Configuration() { this = "FileAccessToHttp" }
 
-    override predicate isSource(DataFlow::Node source) {
-      source instanceof Source
-    }
+    override predicate isSource(DataFlow::Node source) { source instanceof Source }
 
-    override predicate isSink(DataFlow::Node sink) {
-      sink instanceof Sink
-    }
+    override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
 
     override predicate isSanitizer(DataFlow::Node node) {
       super.isSanitizer(node) or
@@ -44,7 +38,7 @@ module FileAccessToHttp {
 
     override predicate isAdditionalTaintStep(DataFlow::Node pred, DataFlow::Node succ) {
       // taint entire object on property write
-      exists (DataFlow::PropWrite pwr |
+      exists(DataFlow::PropWrite pwr |
         succ = pwr.getBase() and
         pred = pwr.getRhs()
       )
@@ -55,10 +49,8 @@ module FileAccessToHttp {
    * A file access parameter, considered as a flow source for file data in outbound network requests.
    */
   private class FileAccessArgumentAsSource extends Source {
-    FileAccessArgumentAsSource() {  
-      exists(FileSystemReadAccess src |
-        this = src.getADataNode().getALocalSource()
-      )
+    FileAccessArgumentAsSource() {
+      exists(FileSystemReadAccess src | this = src.getADataNode().getALocalSource())
     }
   }
 
@@ -66,11 +58,11 @@ module FileAccessToHttp {
    * The URL or data of a client request, considered as a flow source for file data in outbound network requests.
    */
   private class ClientRequestUrlOrDataAsSink extends Sink {
-    ClientRequestUrlOrDataAsSink () {
-      exists (ClientRequest req |
+    ClientRequestUrlOrDataAsSink() {
+      exists(ClientRequest req |
         this = req.getUrl() or
         this = req.getADataNode()
       )
     }
   }
-}
\ No newline at end of file
+}
diff --git a/javascript/ql/src/semmle/javascript/security/dataflow/HardcodedCredentials.qll b/javascript/ql/src/semmle/javascript/security/dataflow/HardcodedCredentials.qll
index 5abef7fcf48f..5566405d4073 100644
--- a/javascript/ql/src/semmle/javascript/security/dataflow/HardcodedCredentials.qll
+++ b/javascript/ql/src/semmle/javascript/security/dataflow/HardcodedCredentials.qll
@@ -1,6 +1,7 @@
 /**
  * Provides a data flow configuration for reasoning about hardcoded credentials.
  */
+
 import javascript
 private import semmle.javascript.security.SensitiveActions
 
@@ -13,9 +14,7 @@ module HardcodedCredentials {
   /**
    * A data flow sink for hardcoded credentials.
    */
-  abstract class Sink extends DataFlow::Node {
-    abstract string getKind();
-  }
+  abstract class Sink extends DataFlow::Node { abstract string getKind(); }
 
   /**
    * A sanitizer for hardcoded credentials.
@@ -28,15 +27,9 @@ module HardcodedCredentials {
   class Configuration extends DataFlow::Configuration {
     Configuration() { this = "HardcodedCredentials" }
 
-    override
-    predicate isSource(DataFlow::Node source) {
-      source instanceof Source
-    }
+    override predicate isSource(DataFlow::Node source) { source instanceof Source }
 
-    override
-    predicate isSink(DataFlow::Node sink) {
-      sink instanceof Sink
-    }
+    override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
   }
 
   /** A constant string, considered as a source of hardcoded credentials. */
@@ -49,13 +42,9 @@ module HardcodedCredentials {
    * as a credentials sink.
    */
   class DefaultCredentialsSink extends Sink {
-    DefaultCredentialsSink() {
-      this.asExpr() instanceof CredentialsExpr
-    }
+    DefaultCredentialsSink() { this.asExpr() instanceof CredentialsExpr }
 
-    override string getKind() {
-      result = this.asExpr().(CredentialsExpr).getCredentialsKind()
-    }
+    override string getKind() { result = this.asExpr().(CredentialsExpr).getCredentialsKind() }
   }
 }
 
diff --git a/javascript/ql/src/semmle/javascript/security/dataflow/HardcodedDataInterpretedAsCode.qll b/javascript/ql/src/semmle/javascript/security/dataflow/HardcodedDataInterpretedAsCode.qll
index f7ff4042f7e6..0f68d96c56c8 100644
--- a/javascript/ql/src/semmle/javascript/security/dataflow/HardcodedDataInterpretedAsCode.qll
+++ b/javascript/ql/src/semmle/javascript/security/dataflow/HardcodedDataInterpretedAsCode.qll
@@ -12,9 +12,7 @@ module HardcodedDataInterpretedAsCode {
    */
   abstract class Source extends DataFlow::Node {
     /** Gets a flow label for which this is a source. */
-    DataFlow::FlowLabel getLabel() {
-      result = DataFlow::FlowLabel::data()
-    }
+    DataFlow::FlowLabel getLabel() { result = DataFlow::FlowLabel::data() }
   }
 
   /**
@@ -31,28 +29,24 @@ module HardcodedDataInterpretedAsCode {
   /**
    * A sanitizer for hard-coded data.
    */
-  abstract class Sanitizer extends DataFlow::Node {}
+  abstract class Sanitizer extends DataFlow::Node { }
 
   /**
    * A taint-tracking configuration for reasoning about hard-coded data
    * being interpreted as code
    */
   class Configuration extends TaintTracking::Configuration {
-    Configuration() {
-      this = "HardcodedDataInterpretedAsCode"
-    }
-  
+    Configuration() { this = "HardcodedDataInterpretedAsCode" }
+
     override predicate isSource(DataFlow::Node source, DataFlow::FlowLabel lbl) {
       source.(Source).getLabel() = lbl
     }
-  
+
     override predicate isSink(DataFlow::Node nd, DataFlow::FlowLabel lbl) {
       nd.(Sink).getLabel() = lbl
     }
 
-    override predicate isSanitizer(DataFlow::Node node) {
-      node instanceof Sanitizer
-    }
+    override predicate isSanitizer(DataFlow::Node node) { node instanceof Sanitizer }
   }
 
   /**
@@ -62,7 +56,7 @@ module HardcodedDataInterpretedAsCode {
    */
   private class DefaultSource extends Source, DataFlow::ValueNode {
     DefaultSource() {
-      exists (string val | val = astNode.(Expr).getStringValue() |
+      exists(string val | val = astNode.(Expr).getStringValue() |
         val.regexpMatch("[0-9a-fA-F]{8,}") and
         val.regexpMatch(".*[0-9].*")
       )
@@ -74,7 +68,9 @@ module HardcodedDataInterpretedAsCode {
    */
   private class DefaultCodeInjectionSink extends Sink {
     DefaultCodeInjectionSink() { this instanceof CodeInjection::Sink }
+
     override DataFlow::FlowLabel getLabel() { result = DataFlow::FlowLabel::taint() }
+
     override string getKind() { result = "code" }
   }
 
@@ -82,9 +78,7 @@ module HardcodedDataInterpretedAsCode {
    * An argument to `require` path; hard-coded data should not flow here.
    */
   private class RequireArgumentSink extends Sink {
-    RequireArgumentSink() {
-      this = any(Require r).getAnArgument().flow()
-    }
+    RequireArgumentSink() { this = any(Require r).getAnArgument().flow() }
 
     override DataFlow::FlowLabel getLabel() {
       result = DataFlow::FlowLabel::data()
diff --git a/javascript/ql/src/semmle/javascript/security/dataflow/HostHeaderPoisoningInEmailGeneration.qll b/javascript/ql/src/semmle/javascript/security/dataflow/HostHeaderPoisoningInEmailGeneration.qll
index 00dda20e4e4f..f59a40dd9d8e 100644
--- a/javascript/ql/src/semmle/javascript/security/dataflow/HostHeaderPoisoningInEmailGeneration.qll
+++ b/javascript/ql/src/semmle/javascript/security/dataflow/HostHeaderPoisoningInEmailGeneration.qll
@@ -13,14 +13,14 @@ module HostHeaderPoisoningInEmailGeneration {
     Configuration() { this = "TaintedHostHeader" }
 
     override predicate isSource(DataFlow::Node node) {
-      exists (HTTP::RequestHeaderAccess input | node = input |
+      exists(HTTP::RequestHeaderAccess input | node = input |
         input.getKind() = "header" and
         input.getAHeaderName() = "host"
       )
     }
 
     override predicate isSink(DataFlow::Node node) {
-      exists (EmailSender email | node = email.getABody())
+      exists(EmailSender email | node = email.getABody())
     }
   }
 }
diff --git a/javascript/ql/src/semmle/javascript/security/dataflow/HttpToFileAccess.qll b/javascript/ql/src/semmle/javascript/security/dataflow/HttpToFileAccess.qll
index 8b47e4ed1928..84b91177a53c 100644
--- a/javascript/ql/src/semmle/javascript/security/dataflow/HttpToFileAccess.qll
+++ b/javascript/ql/src/semmle/javascript/security/dataflow/HttpToFileAccess.qll
@@ -1,11 +1,11 @@
 /**
  * Provides a taint tracking configuration for reasoning about writing user-controlled data to files.
  */
+
 import javascript
 import semmle.javascript.security.dataflow.RemoteFlowSources
 
 module HttpToFileAccess {
-
   /**
    * A data flow source for writing user-controlled data to files.
    */
@@ -25,17 +25,11 @@ module HttpToFileAccess {
    * A taint tracking configuration for writing user-controlled data to files.
    */
   class Configuration extends TaintTracking::Configuration {
-    Configuration() {
-      this = "HttpToFileAccess"
-    }
+    Configuration() { this = "HttpToFileAccess" }
 
-    override predicate isSource(DataFlow::Node source) {
-      source instanceof Source
-    }
+    override predicate isSource(DataFlow::Node source) { source instanceof Source }
 
-    override predicate isSink(DataFlow::Node sink) {
-      sink instanceof Sink
-    }
+    override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
 
     override predicate isSanitizer(DataFlow::Node node) {
       super.isSanitizer(node) or
@@ -50,10 +44,6 @@ module HttpToFileAccess {
 
   /** A sink that represents file access method (write, append) argument */
   class FileAccessAsSink extends Sink {
-    FileAccessAsSink () {
-      exists(FileSystemWriteAccess src |
-        this = src.getADataNode()
-      )
-    }
+    FileAccessAsSink() { exists(FileSystemWriteAccess src | this = src.getADataNode()) }
   }
-}
\ No newline at end of file
+}
diff --git a/javascript/ql/src/semmle/javascript/security/dataflow/InsecureRandomness.qll b/javascript/ql/src/semmle/javascript/security/dataflow/InsecureRandomness.qll
index aed4d712e464..a936a40d729e 100644
--- a/javascript/ql/src/semmle/javascript/security/dataflow/InsecureRandomness.qll
+++ b/javascript/ql/src/semmle/javascript/security/dataflow/InsecureRandomness.qll
@@ -1,6 +1,7 @@
 /**
  * Provides a taint tracking configuration for reasoning about random values that are not cryptographically secure.
  */
+
 import javascript
 private import semmle.javascript.security.SensitiveActions
 
@@ -26,42 +27,34 @@ module InsecureRandomness {
   class Configuration extends TaintTracking::Configuration {
     Configuration() { this = "InsecureRandomness" }
 
-    override
-    predicate isSource(DataFlow::Node source) {
-      source instanceof Source
-    }
+    override predicate isSource(DataFlow::Node source) { source instanceof Source }
 
-    override
-    predicate isSink(DataFlow::Node sink) {
-      sink instanceof Sink
-    }
+    override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
 
-    override
-    predicate isSanitizer(DataFlow::Node node) {
+    override predicate isSanitizer(DataFlow::Node node) {
       // not making use of `super.isSanitizer`: those sanitizers are not for this kind of data
       node instanceof Sanitizer
     }
 
-    override
-    predicate isSanitizer(DataFlow::Node pred, DataFlow::Node succ) {
+    override predicate isSanitizer(DataFlow::Node pred, DataFlow::Node succ) {
       // stop propagation at the sinks to avoid double reporting
       pred instanceof Sink and
       // constrain succ
       pred = succ.getAPredecessor()
-
     }
 
     override predicate isAdditionalTaintStep(DataFlow::Node pred, DataFlow::Node succ) {
       // Assume that all operations on tainted values preserve taint: crypto is hard
-      succ.asExpr().(BinaryExpr).getAnOperand() = pred.asExpr() or
-      succ.asExpr().(UnaryExpr).getOperand() = pred.asExpr() or
-      exists (DataFlow::MethodCallNode mc |
+      succ.asExpr().(BinaryExpr).getAnOperand() = pred.asExpr()
+      or
+      succ.asExpr().(UnaryExpr).getOperand() = pred.asExpr()
+      or
+      exists(DataFlow::MethodCallNode mc |
         mc = DataFlow::globalVarRef("Math").getAMemberCall(_) and
-        pred = mc.getAnArgument() and succ = mc
+        pred = mc.getAnArgument() and
+        succ = mc
       )
-
     }
-
   }
 
   /**
@@ -108,18 +101,13 @@ module InsecureRandomness {
    * A sensitive write, considered as a sink for random values that are not cryptographically
    * secure.
    */
-  class SensitiveWriteSink extends Sink {
-    SensitiveWriteSink() { this instanceof SensitiveWrite }
-  }
+  class SensitiveWriteSink extends Sink { SensitiveWriteSink() { this instanceof SensitiveWrite } }
 
   /**
    * A cryptographic key, considered as a sink for random values that are not cryptographically
    * secure.
    */
-  class CryptoKeySink extends Sink {
-    CryptoKeySink() { this instanceof CryptographicKey }
-  }
-
+  class CryptoKeySink extends Sink { CryptoKeySink() { this instanceof CryptographicKey } }
 }
 
 /** DEPRECATED: Use `InsecureRandomness::Source` instead. */
diff --git a/javascript/ql/src/semmle/javascript/security/dataflow/InsufficientPasswordHash.qll b/javascript/ql/src/semmle/javascript/security/dataflow/InsufficientPasswordHash.qll
index 371cdb01abf4..3318c09212e2 100644
--- a/javascript/ql/src/semmle/javascript/security/dataflow/InsufficientPasswordHash.qll
+++ b/javascript/ql/src/semmle/javascript/security/dataflow/InsufficientPasswordHash.qll
@@ -1,6 +1,7 @@
 /**
  * Provides a taint tracking configuration for reasoning about password hashing with insufficient computational effort.
  */
+
 import javascript
 private import semmle.javascript.security.SensitiveActions
 private import semmle.javascript.frameworks.CryptoLibraries
@@ -36,18 +37,11 @@ module InsufficientPasswordHash {
   class Configuration extends TaintTracking::Configuration {
     Configuration() { this = "InsufficientPasswordHash" }
 
-    override
-    predicate isSource(DataFlow::Node source) {
-      source instanceof Source
-    }
+    override predicate isSource(DataFlow::Node source) { source instanceof Source }
 
-    override
-    predicate isSink(DataFlow::Node sink) {
-      sink instanceof Sink
-    }
+    override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
 
-    override
-    predicate isSanitizer(DataFlow::Node node) {
+    override predicate isSanitizer(DataFlow::Node node) {
       super.isSanitizer(node) or
       node instanceof Sanitizer
     }
@@ -60,9 +54,7 @@ module InsufficientPasswordHash {
   class CleartextPasswordSource extends Source, DataFlow::ValueNode {
     override CleartextPasswordExpr astNode;
 
-    override string describe() {
-      result = astNode.describe()
-    }
+    override string describe() { result = astNode.describe() }
   }
 
   /**
@@ -72,7 +64,8 @@ module InsufficientPasswordHash {
     InsufficientPasswordHashAlgorithm() {
       exists(CryptographicOperation application |
         application.getAlgorithm().isWeak() or
-        not application.getAlgorithm() instanceof PasswordHashingAlgorithm |
+        not application.getAlgorithm() instanceof PasswordHashingAlgorithm
+      |
         this.asExpr() = application.getInput()
       )
     }
@@ -89,4 +82,5 @@ deprecated class InsufficientPasswordHashSink = InsufficientPasswordHash::Sink;
 deprecated class InsufficientPasswordHashSanitizer = InsufficientPasswordHash::Sanitizer;
 
 /** DEPRECATED: Use `InsufficientPasswordHash::Configuration` instead. */
-deprecated class InsufficientPasswordHashDataFlowConfiguration = InsufficientPasswordHash::Configuration;
+deprecated class InsufficientPasswordHashDataFlowConfiguration =
+  InsufficientPasswordHash::Configuration;
diff --git a/javascript/ql/src/semmle/javascript/security/dataflow/MissingRateLimiting.qll b/javascript/ql/src/semmle/javascript/security/dataflow/MissingRateLimiting.qll
index aa4c561047d4..1bfb0b51a9a6 100644
--- a/javascript/ql/src/semmle/javascript/security/dataflow/MissingRateLimiting.qll
+++ b/javascript/ql/src/semmle/javascript/security/dataflow/MissingRateLimiting.qll
@@ -21,20 +21,17 @@
  * For `RateLimitedRouteHandlerExpr`, the default subclasses model popular npm packages;
  * other means of rate-limiting can be supported by adding more subclasses.
  */
-import javascript
 
+import javascript
 
 // main concepts
-
 /**
  * A route handler that should be rate-limited.
  */
 abstract class ExpensiveRouteHandler extends HTTP::RouteHandler {
   Express::RouteHandler impl;
 
-  ExpensiveRouteHandler() {
-    this = impl
-  }
+  ExpensiveRouteHandler() { this = impl }
 
   /**
    * Holds if `explanation` is a string explaining why this route handler should be rate-limited.
@@ -53,25 +50,21 @@ abstract class ExpensiveRouteHandler extends HTTP::RouteHandler {
 /**
  * A route handler expression that is rate limited.
  */
-abstract class RateLimitedRouteHandlerExpr extends Express::RouteHandlerExpr {
-}
-
+abstract class RateLimitedRouteHandlerExpr extends Express::RouteHandlerExpr { }
 
 // default implementations
-
 /**
  * A route handler that performs an expensive action, and hence should be rate-limited.
  */
 class RouteHandlerPerformingExpensiveAction extends ExpensiveRouteHandler, DataFlow::ValueNode {
   ExpensiveAction action;
 
-  RouteHandlerPerformingExpensiveAction() {
-    astNode = action.getContainer()
-  }
+  RouteHandlerPerformingExpensiveAction() { astNode = action.getContainer() }
 
   override predicate explain(string explanation, DataFlow::Node reference, string referenceLabel) {
     explanation = "performs $@" and
-    reference = action and referenceLabel = action.describe()
+    reference = action and
+    referenceLabel = action.describe()
   }
 }
 
@@ -90,24 +83,28 @@ abstract class ExpensiveAction extends DataFlow::Node {
 /** A call to an authorization function, considered as an expensive action. */
 class AuthorizationCallAsExpensiveAction extends ExpensiveAction {
   AuthorizationCallAsExpensiveAction() { this instanceof AuthorizationCall }
+
   override string describe() { result = "authorization" }
 }
 
 /** A file system access, considered as an expensive action. */
 class FileSystemAccessAsExpensiveAction extends ExpensiveAction {
   FileSystemAccessAsExpensiveAction() { this instanceof FileSystemAccess }
+
   override string describe() { result = "a file system access" }
 }
 
 /** A system command execution, considered as an expensive action. */
 class SystemCommandExecutionAsExpensiveAction extends ExpensiveAction {
   SystemCommandExecutionAsExpensiveAction() { this instanceof SystemCommandExecution }
+
   override string describe() { result = "a system command" }
 }
 
 /** A database access, considered as an expensive action. */
 class DatabaseAccessAsExpensiveAction extends ExpensiveAction {
   DatabaseAccessAsExpensiveAction() { this instanceof DatabaseAccess }
+
   override string describe() { result = "a database access" }
 }
 
@@ -115,16 +112,13 @@ class DatabaseAccessAsExpensiveAction extends ExpensiveAction {
  * A route handler expression that is rate-limited by a rate-limiting middleware.
  */
 class RouteHandlerExpressionWithRateLimiter extends RateLimitedRouteHandlerExpr {
-  RouteHandlerExpressionWithRateLimiter() {
-    getAMatchingAncestor() instanceof RateLimiter
-  }
+  RouteHandlerExpressionWithRateLimiter() { getAMatchingAncestor() instanceof RateLimiter }
 }
 
 /**
  * A middleware that acts as a rate limiter.
  */
-abstract class RateLimiter extends Express::RouteHandlerExpr {
-}
+abstract class RateLimiter extends Express::RouteHandlerExpr { }
 
 /**
  * A rate limiter constructed using the `express-rate-limit` package.
@@ -140,7 +134,7 @@ class ExpressRateLimit extends RateLimiter {
  */
 class BruteForceRateLimit extends RateLimiter {
   BruteForceRateLimit() {
-    exists (DataFlow::ModuleImportNode expressBrute, DataFlow::SourceNode prevent |
+    exists(DataFlow::ModuleImportNode expressBrute, DataFlow::SourceNode prevent |
       expressBrute.getPath() = "express-brute" and
       prevent = expressBrute.getAnInstantiation().getAPropertyRead("prevent") and
       prevent.flowsToExpr(this)
@@ -153,9 +147,11 @@ class BruteForceRateLimit extends RateLimiter {
  */
 class RouteHandlerLimitedByExpressLimiter extends RateLimitedRouteHandlerExpr {
   RouteHandlerLimitedByExpressLimiter() {
-    exists (DataFlow::ModuleImportNode expressLimiter |
+    exists(DataFlow::ModuleImportNode expressLimiter |
       expressLimiter.getPath() = "express-limiter" and
-      expressLimiter.getACall().getArgument(0).getALocalSource().asExpr() = this.getSetup().getRouter()
+      expressLimiter.getACall().getArgument(0).getALocalSource().asExpr() = this
+            .getSetup()
+            .getRouter()
     )
   }
 }
diff --git a/javascript/ql/src/semmle/javascript/security/dataflow/NosqlInjection.qll b/javascript/ql/src/semmle/javascript/security/dataflow/NosqlInjection.qll
index c338e6ced504..dbbd6cfdbe2f 100644
--- a/javascript/ql/src/semmle/javascript/security/dataflow/NosqlInjection.qll
+++ b/javascript/ql/src/semmle/javascript/security/dataflow/NosqlInjection.qll
@@ -21,9 +21,7 @@ module NosqlInjection {
      *
      * Defaults to deeply tainted objects only.
      */
-    DataFlow::FlowLabel getAFlowLabel() {
-      result = TaintedObject::label()
-    }
+    DataFlow::FlowLabel getAFlowLabel() { result = TaintedObject::label() }
   }
 
   /**
@@ -37,9 +35,7 @@ module NosqlInjection {
   class Configuration extends TaintTracking::Configuration {
     Configuration() { this = "NosqlInjection" }
 
-    override predicate isSource(DataFlow::Node source) {
-      source instanceof Source
-    }
+    override predicate isSource(DataFlow::Node source) { source instanceof Source }
 
     override predicate isSource(DataFlow::Node source, DataFlow::FlowLabel label) {
       TaintedObject::isSource(source, label)
@@ -58,13 +54,15 @@ module NosqlInjection {
       guard instanceof TaintedObject::SanitizerGuard
     }
 
-    override predicate isAdditionalFlowStep(DataFlow::Node src, DataFlow::Node trg, DataFlow::FlowLabel inlbl, DataFlow::FlowLabel outlbl) {
+    override predicate isAdditionalFlowStep(
+      DataFlow::Node src, DataFlow::Node trg, DataFlow::FlowLabel inlbl, DataFlow::FlowLabel outlbl
+    ) {
       TaintedObject::step(src, trg, inlbl, outlbl)
       or
       // additional flow step to track taint through NoSQL query objects
       inlbl = TaintedObject::label() and
       outlbl = TaintedObject::label() and
-      exists (NoSQL::Query query, DataFlow::SourceNode queryObj |
+      exists(NoSQL::Query query, DataFlow::SourceNode queryObj |
         queryObj.flowsToExpr(query) and
         queryObj.flowsTo(trg) and
         src = queryObj.getAPropertyWrite().getRhs()
@@ -78,9 +76,7 @@ module NosqlInjection {
   }
 
   /** An expression interpreted as a NoSQL query, viewed as a sink. */
-  class NosqlQuerySink extends Sink, DataFlow::ValueNode {
-    override NoSQL::Query astNode;
-  }
+  class NosqlQuerySink extends Sink, DataFlow::ValueNode { override NoSQL::Query astNode; }
 }
 
 /** DEPRECATED: Use `NosqlInjection::Source` instead. */
diff --git a/javascript/ql/src/semmle/javascript/security/dataflow/PropertyInjectionShared.qll b/javascript/ql/src/semmle/javascript/security/dataflow/PropertyInjectionShared.qll
index 633ce99aaed5..d08ffd431a9c 100644
--- a/javascript/ql/src/semmle/javascript/security/dataflow/PropertyInjectionShared.qll
+++ b/javascript/ql/src/semmle/javascript/security/dataflow/PropertyInjectionShared.qll
@@ -2,22 +2,20 @@
  * Provides predicates for reasoning about flow of user-controlled values that are used
  * as property names.
  */
+
 import javascript
 
 module PropertyInjection {
   /**
    * A data-flow node that sanitizes user-controlled property names that flow through it.
    */
-  abstract class Sanitizer extends DataFlow::Node {
-  }
+  abstract class Sanitizer extends DataFlow::Node { }
 
   /**
    * Concatenation with a constant, acting as a sanitizer.
    */
   private class ConcatSanitizer extends Sanitizer {
-    ConcatSanitizer() {
-      StringConcatenation::getAnOperand(this).asExpr() instanceof ConstantString
-    }
+    ConcatSanitizer() { StringConcatenation::getAnOperand(this).asExpr() instanceof ConstantString }
   }
 
   /**
@@ -34,7 +32,7 @@ module PropertyInjection {
     node.analyze().getAValue() instanceof AbstractCallable
     or
     // Assume that a value that is invoked can refer to a function.
-    exists (node.getAnInvocation())
+    exists(node.getAnInvocation())
   }
 
   /**
diff --git a/javascript/ql/src/semmle/javascript/security/dataflow/ReflectedXss.qll b/javascript/ql/src/semmle/javascript/security/dataflow/ReflectedXss.qll
index bf4083b33519..dc4c558d2760 100644
--- a/javascript/ql/src/semmle/javascript/security/dataflow/ReflectedXss.qll
+++ b/javascript/ql/src/semmle/javascript/security/dataflow/ReflectedXss.qll
@@ -29,13 +29,9 @@ module ReflectedXss {
   class Configuration extends TaintTracking::Configuration {
     Configuration() { this = "ReflectedXss" }
 
-    override predicate isSource(DataFlow::Node source) {
-      source instanceof Source
-    }
+    override predicate isSource(DataFlow::Node source) { source instanceof Source }
 
-    override predicate isSink(DataFlow::Node sink) {
-      sink instanceof Sink
-    }
+    override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
 
     override predicate isSanitizer(DataFlow::Node node) {
       super.isSanitizer(node) or
@@ -61,12 +57,11 @@ module ReflectedXss {
    */
   private class HttpResponseSink extends Sink {
     HttpResponseSink() {
-      exists (HTTP::ResponseSendArgument sendarg | sendarg = asExpr() |
-        forall (HTTP::HeaderDefinition hd |
-          hd = sendarg.getRouteHandler().getAResponseHeader("content-type") |
-          exists (string tp | hd.defines("content-type", tp) |
-            tp.toLowerCase().matches("%html%")
-          )
+      exists(HTTP::ResponseSendArgument sendarg | sendarg = asExpr() |
+        forall(HTTP::HeaderDefinition hd |
+          hd = sendarg.getRouteHandler().getAResponseHeader("content-type")
+        |
+          exists(string tp | hd.defines("content-type", tp) | tp.toLowerCase().matches("%html%"))
         )
       )
     }
diff --git a/javascript/ql/src/semmle/javascript/security/dataflow/RegExpInjection.qll b/javascript/ql/src/semmle/javascript/security/dataflow/RegExpInjection.qll
index e771f2a14ef6..cba356751687 100644
--- a/javascript/ql/src/semmle/javascript/security/dataflow/RegExpInjection.qll
+++ b/javascript/ql/src/semmle/javascript/security/dataflow/RegExpInjection.qll
@@ -27,13 +27,9 @@ module RegExpInjection {
   class Configuration extends TaintTracking::Configuration {
     Configuration() { this = "RegExpInjection" }
 
-    override predicate isSource(DataFlow::Node source) {
-      source instanceof Source
-    }
+    override predicate isSource(DataFlow::Node source) { source instanceof Source }
 
-    override predicate isSink(DataFlow::Node sink) {
-      sink instanceof Sink
-    }
+    override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
 
     override predicate isSanitizer(DataFlow::Node node) {
       super.isSanitizer(node) or
@@ -53,9 +49,7 @@ module RegExpInjection {
    * The source string of a regular expression.
    */
   class RegularExpressionSourceAsSink extends Sink {
-    RegularExpressionSourceAsSink() {
-      isInterpretedAsRegExp(this)
-    }
+    RegularExpressionSourceAsSink() { isInterpretedAsRegExp(this) }
   }
 
   /**
@@ -64,11 +58,12 @@ module RegExpInjection {
    */
   class RegExpSanitizationCall extends Sanitizer, DataFlow::ValueNode {
     RegExpSanitizationCall() {
-      exists (string calleeName, string sanitize, string regexp |
+      exists(string calleeName, string sanitize, string regexp |
         calleeName = astNode.(CallExpr).getCalleeName() and
-        sanitize = "(?:escape|saniti[sz]e)" and regexp = "regexp?" |
-        calleeName.regexpMatch("(?i)(" + sanitize + regexp + ")" +
-                                  "|(" + regexp + sanitize + ")")
+        sanitize = "(?:escape|saniti[sz]e)" and
+        regexp = "regexp?"
+      |
+        calleeName.regexpMatch("(?i)(" + sanitize + regexp + ")" + "|(" + regexp + sanitize + ")")
       )
     }
   }
diff --git a/javascript/ql/src/semmle/javascript/security/dataflow/RemotePropertyInjection.qll b/javascript/ql/src/semmle/javascript/security/dataflow/RemotePropertyInjection.qll
index 6d4cd47c2bfd..1a984aec4371 100644
--- a/javascript/ql/src/semmle/javascript/security/dataflow/RemotePropertyInjection.qll
+++ b/javascript/ql/src/semmle/javascript/security/dataflow/RemotePropertyInjection.qll
@@ -18,7 +18,6 @@ module RemotePropertyInjection {
    * A data flow sink for remote property injection.
    */
   abstract class Sink extends DataFlow::Node {
-
     /**
      * Gets a string to identify the different types of sinks.
      */
@@ -36,13 +35,9 @@ module RemotePropertyInjection {
   class Configuration extends TaintTracking::Configuration {
     Configuration() { this = "RemotePropertyInjection" }
 
-    override predicate isSource(DataFlow::Node source) {
-      source instanceof Source
-    }
+    override predicate isSource(DataFlow::Node source) { source instanceof Source }
 
-    override predicate isSink(DataFlow::Node sink) {
-      sink instanceof Sink
-    }
+    override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
 
     override predicate isSanitizer(DataFlow::Node node) {
       super.isSanitizer(node) or
@@ -62,15 +57,13 @@ module RemotePropertyInjection {
   /**
    * A sink for property writes with dynamically computed property name.
    */
-  class PropertyWriteSink extends Sink, DataFlow::ValueNode  {
+  class PropertyWriteSink extends Sink, DataFlow::ValueNode {
     PropertyWriteSink() {
-      exists (DataFlow::PropWrite pw | astNode = pw.getPropertyNameExpr()) or
-      exists (DeleteExpr expr | expr.getOperand().(PropAccess).getPropertyNameExpr() = astNode)
+      exists(DataFlow::PropWrite pw | astNode = pw.getPropertyNameExpr()) or
+      exists(DeleteExpr expr | expr.getOperand().(PropAccess).getPropertyNameExpr() = astNode)
     }
 
-    override string getMessage() {
-      result = " a property name to write to."
-    }
+    override string getMessage() { result = " a property name to write to." }
   }
 
   /**
@@ -80,16 +73,14 @@ module RemotePropertyInjection {
    * header names as properties. This case is already handled by
    * `PropertyWriteSink`.
    */
-  class HeaderNameSink extends Sink, DataFlow::ValueNode  {
+  class HeaderNameSink extends Sink, DataFlow::ValueNode {
     HeaderNameSink() {
-      exists (HTTP::ExplicitHeaderDefinition  hd |
+      exists(HTTP::ExplicitHeaderDefinition hd |
         not hd instanceof Express::SetMultipleHeaders and
         astNode = hd.getNameExpr()
       )
     }
 
-    override string getMessage() {
-      result = " a header name."
-    }
+    override string getMessage() { result = " a header name." }
   }
 }
diff --git a/javascript/ql/src/semmle/javascript/security/dataflow/RequestForgery.qll b/javascript/ql/src/semmle/javascript/security/dataflow/RequestForgery.qll
index 4a24bff2c28c..0e9da43f0fb7 100644
--- a/javascript/ql/src/semmle/javascript/security/dataflow/RequestForgery.qll
+++ b/javascript/ql/src/semmle/javascript/security/dataflow/RequestForgery.qll
@@ -6,7 +6,6 @@ import semmle.javascript.security.dataflow.RemoteFlowSources
 import UrlConcatenation
 
 module RequestForgery {
-
   /**
    * A data flow source for request forgery.
    */
@@ -25,7 +24,6 @@ module RequestForgery {
      * Gets the kind of this sink.
      */
     abstract string getKind();
-
   }
 
   /**
@@ -37,17 +35,11 @@ module RequestForgery {
    * A taint tracking configuration for request forgery.
    */
   class Configuration extends TaintTracking::Configuration {
-    Configuration() {
-      this = "RequestForgery"
-    }
+    Configuration() { this = "RequestForgery" }
 
-    override predicate isSource(DataFlow::Node source) {
-      source instanceof Source
-    }
+    override predicate isSource(DataFlow::Node source) { source instanceof Source }
 
-    override predicate isSink(DataFlow::Node sink) {
-      sink instanceof Sink
-    }
+    override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
 
     override predicate isSanitizer(DataFlow::Node node) {
       super.isSanitizer(node) or
@@ -57,7 +49,6 @@ module RequestForgery {
     override predicate isSanitizer(DataFlow::Node source, DataFlow::Node sink) {
       sanitizingPrefixEdge(source, sink)
     }
-
   }
 
   /** A source of remote user input, considered as a flow source for request forgery. */
@@ -69,23 +60,18 @@ module RequestForgery {
    * The URL of a URL request, viewed as a sink for request forgery.
    */
   private class ClientRequestUrlAsSink extends Sink {
-
     ClientRequest request;
 
     string kind;
 
     ClientRequestUrlAsSink() {
-      this = request.getUrl() and kind = "URL" or
+      this = request.getUrl() and kind = "URL"
+      or
       this = request.getHost() and kind = "host"
     }
 
-    override DataFlow::Node getARequest() {
-      result = request
-    }
-
-    override string getKind() {
-      result = kind
-    }
+    override DataFlow::Node getARequest() { result = request }
 
+    override string getKind() { result = kind }
   }
 }
diff --git a/javascript/ql/src/semmle/javascript/security/dataflow/ServerSideUrlRedirect.qll b/javascript/ql/src/semmle/javascript/security/dataflow/ServerSideUrlRedirect.qll
index c2c4f21ad9e0..5cc3c5930194 100644
--- a/javascript/ql/src/semmle/javascript/security/dataflow/ServerSideUrlRedirect.qll
+++ b/javascript/ql/src/semmle/javascript/security/dataflow/ServerSideUrlRedirect.qll
@@ -17,7 +17,7 @@ module ServerSideUrlRedirect {
    * A data flow sink for unvalidated URL redirect vulnerabilities.
    */
   abstract class Sink extends DataFlow::Node { }
-  
+
   /**
    * A sanitizer for unvalidated URL redirect vulnerabilities.
    */
@@ -29,13 +29,9 @@ module ServerSideUrlRedirect {
   class Configuration extends TaintTracking::Configuration {
     Configuration() { this = "ServerSideUrlRedirect" }
 
-    override predicate isSource(DataFlow::Node source) {
-      source instanceof Source
-    }
+    override predicate isSource(DataFlow::Node source) { source instanceof Source }
 
-    override predicate isSink(DataFlow::Node sink) {
-      sink instanceof Sink
-    }
+    override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
 
     override predicate isSanitizer(DataFlow::Node node) {
       super.isSanitizer(node) or
@@ -49,7 +45,6 @@ module ServerSideUrlRedirect {
     override predicate isSanitizerGuard(TaintTracking::SanitizerGuardNode guard) {
       guard instanceof LocalUrlSanitizingGuard
     }
-
   }
 
   /** A source of third-party user input, considered as a flow source for URL redirects. */
@@ -63,9 +58,7 @@ module ServerSideUrlRedirect {
    * An HTTP redirect, considered as a sink for `Configuration`.
    */
   class RedirectSink extends Sink, DataFlow::ValueNode {
-    RedirectSink() {
-      astNode = any(HTTP::RedirectInvocation redir).getUrlArgument()
-    }
+    RedirectSink() { astNode = any(HTTP::RedirectInvocation redir).getUrlArgument() }
   }
 
   /**
@@ -83,9 +76,7 @@ module ServerSideUrlRedirect {
    * considered to sanitize a variable for purposes of URL redirection.
    */
   class LocalUrlSanitizingGuard extends TaintTracking::SanitizerGuardNode, DataFlow::CallNode {
-    LocalUrlSanitizingGuard() {
-      this.getCalleeName().regexpMatch("(?i)(is_?)?local_?url")
-    }
+    LocalUrlSanitizingGuard() { this.getCalleeName().regexpMatch("(?i)(is_?)?local_?url") }
 
     override predicate sanitizes(boolean outcome, Expr e) {
       // `isLocalUrl(e)` sanitizes `e` if it evaluates to `true`
@@ -100,9 +91,11 @@ module ServerSideUrlRedirect {
   class WebViewUrlSink extends Sink {
     WebViewUrlSink() {
       // `url` or `source.uri` properties of React Native `WebView`
-      exists (ReactNative::WebViewElement webView, DataFlow::SourceNode source, string prop |
-        source = webView and prop = "url" or
-        source = webView.getAPropertyWrite("source").getRhs().getALocalSource() and prop = "uri" |
+      exists(ReactNative::WebViewElement webView, DataFlow::SourceNode source, string prop |
+        source = webView and prop = "url"
+        or
+        source = webView.getAPropertyWrite("source").getRhs().getALocalSource() and prop = "uri"
+      |
         this = source.getAPropertyWrite(prop).getRhs()
       )
     }
diff --git a/javascript/ql/src/semmle/javascript/security/dataflow/SqlInjection.qll b/javascript/ql/src/semmle/javascript/security/dataflow/SqlInjection.qll
index f76b7947004f..e817ac77d2b9 100644
--- a/javascript/ql/src/semmle/javascript/security/dataflow/SqlInjection.qll
+++ b/javascript/ql/src/semmle/javascript/security/dataflow/SqlInjection.qll
@@ -27,13 +27,9 @@ module SqlInjection {
   class Configuration extends TaintTracking::Configuration {
     Configuration() { this = "SqlInjection" }
 
-    override predicate isSource(DataFlow::Node source) {
-      source instanceof Source
-    }
+    override predicate isSource(DataFlow::Node source) { source instanceof Source }
 
-    override predicate isSink(DataFlow::Node sink) {
-      sink instanceof Sink
-    }
+    override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
 
     override predicate isSanitizer(DataFlow::Node node) {
       super.isSanitizer(node) or
@@ -47,15 +43,11 @@ module SqlInjection {
   }
 
   /** An SQL expression passed to an API call that executes SQL. */
-  class SqlInjectionExprSink extends Sink, DataFlow::ValueNode {
-    override SQL::SqlString astNode;
-  }
+  class SqlInjectionExprSink extends Sink, DataFlow::ValueNode { override SQL::SqlString astNode; }
 
   /** An expression that sanitizes a value for the purposes of SQL injection. */
   class SanitizerExpr extends Sanitizer, DataFlow::ValueNode {
-    SanitizerExpr() {
-      astNode = any(SQL::SqlSanitizer ss).getOutput()
-    }
+    SanitizerExpr() { astNode = any(SQL::SqlSanitizer ss).getOutput() }
   }
 }
 
diff --git a/javascript/ql/src/semmle/javascript/security/dataflow/StackTraceExposure.qll b/javascript/ql/src/semmle/javascript/security/dataflow/StackTraceExposure.qll
index e0367666a8d1..84ac7878e59c 100644
--- a/javascript/ql/src/semmle/javascript/security/dataflow/StackTraceExposure.qll
+++ b/javascript/ql/src/semmle/javascript/security/dataflow/StackTraceExposure.qll
@@ -19,9 +19,7 @@ module StackTraceExposure {
   class Configuration extends TaintTracking::Configuration {
     Configuration() { this = "StackTraceExposure" }
 
-    override predicate isSource(DataFlow::Node src) {
-      src instanceof Source
-    }
+    override predicate isSource(DataFlow::Node src) { src instanceof Source }
 
     override predicate isSanitizer(DataFlow::Node nd) {
       super.isSanitizer(nd)
@@ -35,12 +33,9 @@ module StackTraceExposure {
       nd = StringConcatenation::getAnOperand(_)
     }
 
-    override predicate isSink(DataFlow::Node snk) {
-      snk instanceof Sink
-    }
+    override predicate isSink(DataFlow::Node snk) { snk instanceof Sink }
   }
 
-
   /**
    * A read of the `stack` property of an exception, viewed as a data flow
    * sink for stack trace exposure vulnerabilities.
@@ -51,14 +46,12 @@ module StackTraceExposure {
       this = DataFlow::parameterNode(any(TryStmt try).getACatchClause().getAParameter())
     }
   }
-  
+
   /**
    * An expression that can become part of an HTTP response body, viewed
    * as a data flow sink for stack trace exposure vulnerabilities.
    */
-  class DefaultSink extends Sink, DataFlow::ValueNode {
-    override HTTP::ResponseBody astNode;
-  }
+  class DefaultSink extends Sink, DataFlow::ValueNode { override HTTP::ResponseBody astNode; }
 }
 
 /** DEPRECATED: Use `StackTraceExposure::Source` instead. */
diff --git a/javascript/ql/src/semmle/javascript/security/dataflow/StoredXss.qll b/javascript/ql/src/semmle/javascript/security/dataflow/StoredXss.qll
index 8606d24af533..b03ff6cd241c 100644
--- a/javascript/ql/src/semmle/javascript/security/dataflow/StoredXss.qll
+++ b/javascript/ql/src/semmle/javascript/security/dataflow/StoredXss.qll
@@ -30,13 +30,9 @@ module StoredXss {
   class Configuration extends TaintTracking::Configuration {
     Configuration() { this = "StoredXss" }
 
-    override predicate isSource(DataFlow::Node source) {
-      source instanceof Source
-    }
+    override predicate isSource(DataFlow::Node source) { source instanceof Source }
 
-    override predicate isSink(DataFlow::Node sink) {
-      sink instanceof Sink
-    }
+    override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
 
     override predicate isSanitizer(DataFlow::Node node) {
       super.isSanitizer(node) or
@@ -46,9 +42,7 @@ module StoredXss {
 
   /** A file name, considered as a flow source for stored XSS. */
   class FileNameSourceAsSource extends Source {
-    FileNameSourceAsSource() {
-      this instanceof FileNameSource
-    }
+    FileNameSourceAsSource() { this instanceof FileNameSource }
   }
 
   /** An ordinary XSS sink, considered as a flow sink for stored XSS. */
@@ -58,5 +52,4 @@ module StoredXss {
       this instanceof DomBasedXss::DomBasedXss::Sink
     }
   }
-
 }
diff --git a/javascript/ql/src/semmle/javascript/security/dataflow/TaintedFormatString.qll b/javascript/ql/src/semmle/javascript/security/dataflow/TaintedFormatString.qll
index b9170aedadbe..3ceef043ece9 100644
--- a/javascript/ql/src/semmle/javascript/security/dataflow/TaintedFormatString.qll
+++ b/javascript/ql/src/semmle/javascript/security/dataflow/TaintedFormatString.qll
@@ -25,33 +25,20 @@ module TaintedFormatString {
    * A taint-tracking configuration for format injections.
    */
   class Configuration extends TaintTracking::Configuration {
-    Configuration() {
-      this = "TaintedFormatString"
-    }
+    Configuration() { this = "TaintedFormatString" }
 
-    override
-    predicate isSource(DataFlow::Node source) {
-      source instanceof Source
-    }
+    override predicate isSource(DataFlow::Node source) { source instanceof Source }
 
-    override
-    predicate isSink(DataFlow::Node sink) {
-      sink instanceof Sink
-    }
+    override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
 
-    override
-    predicate isSanitizer(DataFlow::Node node) {
+    override predicate isSanitizer(DataFlow::Node node) {
       super.isSanitizer(node) or
       node instanceof Sanitizer
     }
   }
 
   /** A source of remote user input, considered as a flow source for format injection. */
-  class RemoteSource extends Source {
-    RemoteSource() {
-      this instanceof RemoteFlowSource
-    }
-  }
+  class RemoteSource extends Source { RemoteSource() { this instanceof RemoteFlowSource } }
 
   /**
    * A format argument to a printf-like function, considered as a flow sink for format injection.
diff --git a/javascript/ql/src/semmle/javascript/security/dataflow/TaintedPath.qll b/javascript/ql/src/semmle/javascript/security/dataflow/TaintedPath.qll
index 55e3455fdd5a..d97ecc91f5a1 100644
--- a/javascript/ql/src/semmle/javascript/security/dataflow/TaintedPath.qll
+++ b/javascript/ql/src/semmle/javascript/security/dataflow/TaintedPath.qll
@@ -27,13 +27,9 @@ module TaintedPath {
   class Configuration extends TaintTracking::Configuration {
     Configuration() { this = "TaintedPath" }
 
-    override predicate isSource(DataFlow::Node source) {
-      source instanceof Source
-    }
+    override predicate isSource(DataFlow::Node source) { source instanceof Source }
 
-    override predicate isSink(DataFlow::Node sink) {
-      sink instanceof Sink
-    }
+    override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
 
     override predicate isSanitizer(DataFlow::Node node) {
       super.isSanitizer(node) or
@@ -43,7 +39,6 @@ module TaintedPath {
     override predicate isSanitizerGuard(TaintTracking::SanitizerGuardNode guard) {
       guard instanceof StrongPathCheck
     }
-
   }
 
   /**
@@ -71,11 +66,12 @@ module TaintedPath {
    */
   class FsPathSink extends Sink, DataFlow::ValueNode {
     FsPathSink() {
-      exists (FileSystemAccess fs |
+      exists(FileSystemAccess fs |
         this = fs.getAPathArgument() and
         not exists(fs.getRootPathArgument())
         or
-        this = fs.getRootPathArgument())
+        this = fs.getRootPathArgument()
+      )
     }
   }
 
@@ -84,7 +80,7 @@ module TaintedPath {
    */
   class ExpressRenderSink extends Sink, DataFlow::ValueNode {
     ExpressRenderSink() {
-      exists (MethodCallExpr mce |
+      exists(MethodCallExpr mce |
         Express::isResponse(mce.getReceiver()) and
         mce.getMethodName() = "render" and
         astNode = mce.getArgument(0)
@@ -96,9 +92,7 @@ module TaintedPath {
    * A `templateUrl` member of an AngularJS directive.
    */
   class AngularJSTemplateUrlSink extends Sink, DataFlow::ValueNode {
-    AngularJSTemplateUrlSink() {
-      this = any(AngularJS::CustomDirective d).getMember("templateUrl")
-    }
+    AngularJSTemplateUrlSink() { this = any(AngularJS::CustomDirective d).getMember("templateUrl") }
   }
 
   /**
@@ -106,7 +100,7 @@ module TaintedPath {
    */
   predicate weakCheck(Expr check, boolean outcome, VarAccess path) {
     // `path.startsWith`, `path.endsWith`, `fs.existsSync(path)`
-    exists (Expr base, string m | check.(MethodCallExpr).calls(base, m) |
+    exists(Expr base, string m | check.(MethodCallExpr).calls(base, m) |
       path = base and
       (m = "startsWith" or m = "endsWith")
       or
@@ -120,8 +114,9 @@ module TaintedPath {
     (outcome = true or outcome = false)
     or
     // `path != null`, `path != undefined`, `path != "somestring"`
-    exists (EqualityTest eq, Expr op |
-      eq = check and eq.hasOperands(path, op) and outcome = eq.getPolarity().booleanNot() |
+    exists(EqualityTest eq, Expr op |
+      eq = check and eq.hasOperands(path, op) and outcome = eq.getPolarity().booleanNot()
+    |
       op instanceof NullLiteral or
       op instanceof SyntacticConstants::UndefinedConstant or
       exists(op.getStringValue())
@@ -137,10 +132,11 @@ module TaintedPath {
    */
   class StrongPathCheck extends TaintTracking::SanitizerGuardNode {
     VarAccess path;
+
     boolean sanitizedOutcome;
 
     StrongPathCheck() {
-      exists (ConditionGuardNode cgg | asExpr() = cgg.getTest() |
+      exists(ConditionGuardNode cgg | asExpr() = cgg.getTest() |
         asExpr() = path.getParentExpr*() and
         path = any(SsaVariable v).getAUse() and
         (sanitizedOutcome = true or sanitizedOutcome = false) and
diff --git a/javascript/ql/src/semmle/javascript/security/dataflow/TypeConfusionThroughParameterTampering.qll b/javascript/ql/src/semmle/javascript/security/dataflow/TypeConfusionThroughParameterTampering.qll
index 2847945a87bd..c21f07c46b62 100644
--- a/javascript/ql/src/semmle/javascript/security/dataflow/TypeConfusionThroughParameterTampering.qll
+++ b/javascript/ql/src/semmle/javascript/security/dataflow/TypeConfusionThroughParameterTampering.qll
@@ -1,12 +1,12 @@
 /**
  * Provides a tracking configuration for reasoning about type confusion for HTTP request inputs.
  */
+
 import javascript
 import semmle.javascript.security.dataflow.RemoteFlowSources
 private import semmle.javascript.dataflow.InferredTypes
 
 module TypeConfusionThroughParameterTampering {
-
   /**
    * A data flow source for type confusion for HTTP request inputs.
    */
@@ -26,13 +26,9 @@ module TypeConfusionThroughParameterTampering {
    * A taint tracking configuration for type confusion for HTTP request inputs.
    */
   class Configuration extends DataFlow::Configuration {
-    Configuration() {
-      this = "TypeConfusionThroughParameterTampering"
-    }
+    Configuration() { this = "TypeConfusionThroughParameterTampering" }
 
-    override predicate isSource(DataFlow::Node source) {
-      source instanceof Source
-    }
+    override predicate isSource(DataFlow::Node source) { source instanceof Source }
 
     override predicate isSink(DataFlow::Node sink) {
       sink instanceof Sink and
@@ -40,10 +36,7 @@ module TypeConfusionThroughParameterTampering {
       sink.analyze().getAType() = TTObject()
     }
 
-    override predicate isBarrier(DataFlow::Node node) {
-      node instanceof Barrier
-    }
-
+    override predicate isBarrier(DataFlow::Node node) { node instanceof Barrier }
   }
 
   /**
@@ -52,29 +45,24 @@ module TypeConfusionThroughParameterTampering {
    * Node.js-based HTTP servers turn request parameters into arrays if their names are repeated.
    */
   private class TypeTamperableRequestParameter extends Source {
-
-    TypeTamperableRequestParameter() {
-      this.(HTTP::RequestInputAccess).isUserControlledObject()
-    }
-
+    TypeTamperableRequestParameter() { this.(HTTP::RequestInputAccess).isUserControlledObject() }
   }
 
   /**
    * Methods calls that behave slightly different for arrays and strings receivers.
    */
   private class StringArrayAmbiguousMethodCall extends Sink {
-
     StringArrayAmbiguousMethodCall() {
-      exists (string name, DataFlow::MethodCallNode mc |
+      exists(string name, DataFlow::MethodCallNode mc |
         name = "concat" or
         name = "includes" or
         name = "indexOf" or
         name = "lastIndexOf" or
-        name = "slice" |
+        name = "slice"
+      |
         mc.calls(this, name) and
         // ignore patterns that are innocent in practice
-        not exists (EqualityTest cmp, Expr op |
-          cmp.hasOperands(mc.asExpr(), op) |
+        not exists(EqualityTest cmp, Expr op | cmp.hasOperands(mc.asExpr(), op) |
           // prefix checking: `x.indexOf(prefix) === 0`
           name = "indexOf" and
           op.getIntValue() = 0
@@ -86,35 +74,27 @@ module TypeConfusionThroughParameterTampering {
         )
       )
     }
-
   }
 
   /**
    * An access to the `length` property of an object.
    */
   private class LengthAccess extends Sink {
-
     LengthAccess() {
-      exists (DataFlow::PropRead read |
+      exists(DataFlow::PropRead read |
         read.accesses(this, "length") and
         // exclude truthiness checks on the length: an array/string confusion cannot control an emptiness check
         not (
-          exists (ConditionGuardNode cond |
-            read.asExpr() = cond.getTest()
-          )
+          exists(ConditionGuardNode cond | read.asExpr() = cond.getTest())
           or
-          exists (Comparison cmp, Expr zero |
+          exists(Comparison cmp, Expr zero |
             zero.getIntValue() = 0 and
             cmp.hasOperands(read.asExpr(), zero)
           )
           or
-          exists (LogNotExpr neg |
-            neg.getOperand() = read.asExpr()
-          )
+          exists(LogNotExpr neg | neg.getOperand() = read.asExpr())
         )
       )
     }
-
   }
-
 }
diff --git a/javascript/ql/src/semmle/javascript/security/dataflow/UnsafeDeserialization.qll b/javascript/ql/src/semmle/javascript/security/dataflow/UnsafeDeserialization.qll
index 737cd29e9cea..86b518bdf8de 100644
--- a/javascript/ql/src/semmle/javascript/security/dataflow/UnsafeDeserialization.qll
+++ b/javascript/ql/src/semmle/javascript/security/dataflow/UnsafeDeserialization.qll
@@ -27,13 +27,9 @@ module UnsafeDeserialization {
   class Configuration extends TaintTracking::Configuration {
     Configuration() { this = "UnsafeDeserialization" }
 
-    override predicate isSource(DataFlow::Node source) {
-      source instanceof Source
-    }
+    override predicate isSource(DataFlow::Node source) { source instanceof Source }
 
-    override predicate isSink(DataFlow::Node sink) {
-      sink instanceof Sink
-    }
+    override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
 
     override predicate isSanitizer(DataFlow::Node node) {
       super.isSanitizer(node) or
@@ -51,19 +47,18 @@ module UnsafeDeserialization {
    */
   class JsYamlUnsafeLoad extends Sink {
     JsYamlUnsafeLoad() {
-      exists (DataFlow::ModuleImportNode mi | mi.getPath() = "js-yaml" |
+      exists(DataFlow::ModuleImportNode mi | mi.getPath() = "js-yaml" |
         // the first argument to a call to `load` or `loadAll`
-        exists (string n | n = "load" or n = "loadAll" |
-          this = mi.getAMemberCall(n).getArgument(0)
-        )
+        exists(string n | n = "load" or n = "loadAll" | this = mi.getAMemberCall(n).getArgument(0))
         or
         // the first argument to a call to `safeLoad` or `safeLoadAll` where
         // the schema is specified to be `DEFAULT_FULL_SCHEMA`
-        exists (string n, DataFlow::CallNode c, DataFlow::Node fullSchema |
-          n = "safeLoad" or n = "safeLoadAll" |
+        exists(string n, DataFlow::CallNode c, DataFlow::Node fullSchema |
+          n = "safeLoad" or n = "safeLoadAll"
+        |
           c = mi.getAMemberCall(n) and
           this = c.getArgument(0) and
-          fullSchema = c.getOptionArgument(c.getNumArgument()-1, "schema") and
+          fullSchema = c.getOptionArgument(c.getNumArgument() - 1, "schema") and
           mi.getAPropertyRead("DEFAULT_FULL_SCHEMA").flowsTo(fullSchema)
         )
       )
diff --git a/javascript/ql/src/semmle/javascript/security/dataflow/UnsafeDynamicMethodAccess.qll b/javascript/ql/src/semmle/javascript/security/dataflow/UnsafeDynamicMethodAccess.qll
index dace67b1bb9a..b88d032550e1 100644
--- a/javascript/ql/src/semmle/javascript/security/dataflow/UnsafeDynamicMethodAccess.qll
+++ b/javascript/ql/src/semmle/javascript/security/dataflow/UnsafeDynamicMethodAccess.qll
@@ -9,7 +9,7 @@ import PropertyInjectionShared
 
 module UnsafeDynamicMethodAccess {
   private import DataFlow::FlowLabel
-  
+
   /**
    * A data flow source for unsafe dynamic method access.
    */
@@ -17,9 +17,7 @@ module UnsafeDynamicMethodAccess {
     /**
      * Gets the flow label relevant for this source.
      */
-    DataFlow::FlowLabel getFlowLabel() {
-      result = data()
-    }
+    DataFlow::FlowLabel getFlowLabel() { result = data() }
   }
 
   /**
@@ -42,6 +40,7 @@ module UnsafeDynamicMethodAccess {
    * function as a result of an attacker-controlled property name.
    */
   UnsafeFunction unsafeFunction() { any() }
+
   private class UnsafeFunction extends DataFlow::FlowLabel {
     UnsafeFunction() { this = "UnsafeFunction" }
   }
@@ -73,22 +72,27 @@ module UnsafeDynamicMethodAccess {
       PropertyInjection::hasUnsafeMethods(node) // Redefined here so custom queries can override it
     }
 
-    override predicate isAdditionalFlowStep(DataFlow::Node src, DataFlow::Node dst, DataFlow::FlowLabel srclabel, DataFlow::FlowLabel dstlabel) {
+    override predicate isAdditionalFlowStep(
+      DataFlow::Node src, DataFlow::Node dst, DataFlow::FlowLabel srclabel,
+      DataFlow::FlowLabel dstlabel
+    ) {
       // Reading a property of the global object or of a function
-      exists (DataFlow::PropRead read |
+      exists(DataFlow::PropRead read |
         hasUnsafeMethods(read.getBase().getALocalSource()) and
         src = read.getPropertyNameExpr().flow() and
         dst = read and
         (srclabel = data() or srclabel = taint()) and
-        dstlabel = unsafeFunction())
+        dstlabel = unsafeFunction()
+      )
       or
       // Reading a chain of properties from any object with a prototype can lead to Function
-      exists (PropertyProjection proj |
+      exists(PropertyProjection proj |
         not PropertyInjection::isPrototypeLessObject(proj.getObject().getALocalSource()) and
         src = proj.getASelector() and
         dst = proj and
         (srclabel = data() or srclabel = taint()) and
-        dstlabel = unsafeFunction())
+        dstlabel = unsafeFunction()
+      )
     }
   }
 
@@ -102,20 +106,14 @@ module UnsafeDynamicMethodAccess {
   /**
    * The page URL considered as a flow source for unsafe dynamic method access.
    */
-  class DocumentUrlAsSource extends Source {
-    DocumentUrlAsSource() { isDocumentURL(asExpr()) }
-  }
+  class DocumentUrlAsSource extends Source { DocumentUrlAsSource() { isDocumentURL(asExpr()) } }
 
   /**
    * A function invocation of an unsafe function, as a sink for remote unsafe dynamic method access.
    */
   class CalleeAsSink extends Sink {
-    CalleeAsSink() {
-      this = any(DataFlow::InvokeNode node).getCalleeNode()
-    }
+    CalleeAsSink() { this = any(DataFlow::InvokeNode node).getCalleeNode() }
 
-    override DataFlow::FlowLabel getFlowLabel() {
-      result = unsafeFunction()
-    }
+    override DataFlow::FlowLabel getFlowLabel() { result = unsafeFunction() }
   }
 }
diff --git a/javascript/ql/src/semmle/javascript/security/dataflow/UnvalidatedDynamicMethodCall.qll b/javascript/ql/src/semmle/javascript/security/dataflow/UnvalidatedDynamicMethodCall.qll
index f916c67a3e93..7c0d4e289ae8 100644
--- a/javascript/ql/src/semmle/javascript/security/dataflow/UnvalidatedDynamicMethodCall.qll
+++ b/javascript/ql/src/semmle/javascript/security/dataflow/UnvalidatedDynamicMethodCall.qll
@@ -18,9 +18,7 @@ module UnvalidatedDynamicMethodCall {
     /**
      * Gets the flow label relevant for this source.
      */
-    DataFlow::FlowLabel getFlowLabel() {
-      result = data()
-    }
+    DataFlow::FlowLabel getFlowLabel() { result = data() }
   }
 
   /**
@@ -75,16 +73,21 @@ module UnvalidatedDynamicMethodCall {
       nd instanceof PropertyInjection::Sanitizer
     }
 
-    override predicate isAdditionalFlowStep(DataFlow::Node src, DataFlow::Node dst, DataFlow::FlowLabel srclabel, DataFlow::FlowLabel dstlabel) {
-      exists (DataFlow::PropRead read |
+    override predicate isAdditionalFlowStep(
+      DataFlow::Node src, DataFlow::Node dst, DataFlow::FlowLabel srclabel,
+      DataFlow::FlowLabel dstlabel
+    ) {
+      exists(DataFlow::PropRead read |
         src = read.getPropertyNameExpr().flow() and
         dst = read and
         (srclabel = data() or srclabel = taint()) and
-        (dstlabel instanceof MaybeNonFunction
-         or
-         // a property of `Object.create(null)` cannot come from a prototype
-         not PropertyInjection::isPrototypeLessObject(read.getBase().getALocalSource()) and
-         dstlabel instanceof MaybeFromProto) and
+        (
+          dstlabel instanceof MaybeNonFunction
+          or
+          // a property of `Object.create(null)` cannot come from a prototype
+          not PropertyInjection::isPrototypeLessObject(read.getBase().getALocalSource()) and
+          dstlabel instanceof MaybeFromProto
+        ) and
         // avoid overlapping results with unsafe dynamic method access query
         not PropertyInjection::hasUnsafeMethods(read.getBase().getALocalSource())
       )
@@ -101,9 +104,7 @@ module UnvalidatedDynamicMethodCall {
   /**
    * The page URL considered as a flow source for unvalidated dynamic method calls.
    */
-  class DocumentUrlAsSource extends Source {
-    DocumentUrlAsSource() { isDocumentURL(asExpr()) }
-  }
+  class DocumentUrlAsSource extends Source { DocumentUrlAsSource() { isDocumentURL(asExpr()) } }
 
   /**
    * A function invocation of an unsafe function, as a sink for remote unvalidated dynamic method calls.
@@ -134,6 +135,7 @@ module UnvalidatedDynamicMethodCall {
    */
   class FunctionCheck extends TaintTracking::LabeledSanitizerGuardNode, DataFlow::ValueNode {
     override EqualityTest astNode;
+
     TypeofExpr t;
 
     FunctionCheck() {
@@ -146,8 +148,6 @@ module UnvalidatedDynamicMethodCall {
       e = t.getOperand().getUnderlyingValue()
     }
 
-    override DataFlow::FlowLabel getALabel() {
-      result instanceof MaybeNonFunction
-    }
+    override DataFlow::FlowLabel getALabel() { result instanceof MaybeNonFunction }
   }
 }
diff --git a/javascript/ql/src/semmle/javascript/security/dataflow/UrlConcatenation.qll b/javascript/ql/src/semmle/javascript/security/dataflow/UrlConcatenation.qll
index 970e2ee22300..da8e7e922f14 100644
--- a/javascript/ql/src/semmle/javascript/security/dataflow/UrlConcatenation.qll
+++ b/javascript/ql/src/semmle/javascript/security/dataflow/UrlConcatenation.qll
@@ -29,9 +29,10 @@ private predicate hasSanitizingSubstring(DataFlow::Node nd) {
  * This is considered as a sanitizing edge for the URL redirection queries.
  */
 predicate sanitizingPrefixEdge(DataFlow::Node source, DataFlow::Node sink) {
-  exists (DataFlow::Node operator, int n |
+  exists(DataFlow::Node operator, int n |
     StringConcatenation::taintStep(source, sink, operator, n) and
-    hasSanitizingSubstring(StringConcatenation::getOperand(operator, [0..n-1])))
+    hasSanitizingSubstring(StringConcatenation::getOperand(operator, [0 .. n - 1]))
+  )
 }
 
 /**
@@ -47,7 +48,7 @@ predicate sanitizingPrefixEdge(DataFlow::Node source, DataFlow::Node sink) {
  * the `//` separating the (optional) scheme from the hostname.
  */
 private predicate hasHostnameSanitizingSubstring(DataFlow::Node nd) {
-  nd.asExpr().getStringValue().regexpMatch(".*([?#]|[^?#:/\\\\][/\\\\]).*") 
+  nd.asExpr().getStringValue().regexpMatch(".*([?#]|[^?#:/\\\\][/\\\\]).*")
   or
   hasHostnameSanitizingSubstring(StringConcatenation::getAnOperand(nd))
   or
@@ -63,7 +64,8 @@ private predicate hasHostnameSanitizingSubstring(DataFlow::Node nd) {
  * This is considered as a sanitizing edge for the URL redirection queries.
  */
 predicate hostnameSanitizingPrefixEdge(DataFlow::Node source, DataFlow::Node sink) {
-  exists (DataFlow::Node operator, int n |
+  exists(DataFlow::Node operator, int n |
     StringConcatenation::taintStep(source, sink, operator, n) and
-    hasHostnameSanitizingSubstring(StringConcatenation::getOperand(operator, [0..n-1])))
-}
\ No newline at end of file
+    hasHostnameSanitizingSubstring(StringConcatenation::getOperand(operator, [0 .. n - 1]))
+  )
+}
diff --git a/javascript/ql/src/semmle/javascript/security/dataflow/XmlBomb.qll b/javascript/ql/src/semmle/javascript/security/dataflow/XmlBomb.qll
index 8b7a45ed3e0d..a1872fce9487 100644
--- a/javascript/ql/src/semmle/javascript/security/dataflow/XmlBomb.qll
+++ b/javascript/ql/src/semmle/javascript/security/dataflow/XmlBomb.qll
@@ -28,13 +28,9 @@ module XmlBomb {
   class Configuration extends TaintTracking::Configuration {
     Configuration() { this = "XmlBomb" }
 
-    override predicate isSource(DataFlow::Node source) {
-      source instanceof Source
-    }
+    override predicate isSource(DataFlow::Node source) { source instanceof Source }
 
-    override predicate isSink(DataFlow::Node sink) {
-      sink instanceof Sink
-    }
+    override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
 
     override predicate isSanitizer(DataFlow::Node node) {
       super.isSanitizer(node) or
@@ -51,9 +47,7 @@ module XmlBomb {
    * An access to `document.location`, considered as a flow source for XML bomb vulnerabilities.
    */
   class LocationAsSource extends Source, DataFlow::ValueNode {
-    LocationAsSource() {
-      isLocation(astNode)
-    }
+    LocationAsSource() { isLocation(astNode) }
   }
 
   /**
@@ -62,7 +56,7 @@ module XmlBomb {
    */
   class XmlParsingWithEntityResolution extends Sink, DataFlow::ValueNode {
     XmlParsingWithEntityResolution() {
-      exists (XML::ParserInvocation parse | astNode = parse.getSourceArgument() |
+      exists(XML::ParserInvocation parse | astNode = parse.getSourceArgument() |
         parse.resolvesEntities(XML::InternalEntity())
       )
     }
diff --git a/javascript/ql/src/semmle/javascript/security/dataflow/XpathInjection.qll b/javascript/ql/src/semmle/javascript/security/dataflow/XpathInjection.qll
index 93506d745635..89ae213088dd 100644
--- a/javascript/ql/src/semmle/javascript/security/dataflow/XpathInjection.qll
+++ b/javascript/ql/src/semmle/javascript/security/dataflow/XpathInjection.qll
@@ -27,29 +27,18 @@ module XpathInjection {
   class Configuration extends TaintTracking::Configuration {
     Configuration() { this = "XpathInjection" }
 
-    override
-    predicate isSource(DataFlow::Node source) {
-      source instanceof Source
-    }
+    override predicate isSource(DataFlow::Node source) { source instanceof Source }
 
-    override
-    predicate isSink(DataFlow::Node sink) {
-      sink instanceof Sink
-    }
+    override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
 
-    override
-    predicate isSanitizer(DataFlow::Node node) {
+    override predicate isSanitizer(DataFlow::Node node) {
       super.isSanitizer(node) or
       node instanceof Sanitizer
     }
   }
 
   /** A source of remote user input, considered as a flow source for XPath injection. */
-  class RemoteSource extends Source {
-    RemoteSource() {
-      this instanceof RemoteFlowSource
-    }
-  }
+  class RemoteSource extends Source { RemoteSource() { this instanceof RemoteFlowSource } }
 
   /**
    * The `expression` argument to `xpath.parse` or `xpath.select` (and similar) from
@@ -58,10 +47,10 @@ module XpathInjection {
   class XpathParseSelectSink extends Sink {
     XpathParseSelectSink() {
       // both packages appear to expose the same API
-      exists (string xpath | xpath = "xpath" or xpath = "xpath.js" |
+      exists(string xpath | xpath = "xpath" or xpath = "xpath.js" |
         // `xpath.parse`, `xpath.select` and `xpath.select1` all interpret their first
         // argument as an XPath expression
-        exists (string m | m = "parse" or m = "select" or m = "select1" |
+        exists(string m | m = "parse" or m = "select" or m = "select1" |
           this = DataFlow::moduleMember(xpath, m).getACall().getArgument(0)
         )
         or
@@ -74,9 +63,7 @@ module XpathInjection {
 
   /** A part of the document URL, considered as a flow source for XPath injection. */
   class DocumentUrlSource extends Source, DataFlow::ValueNode {
-    DocumentUrlSource() {
-      isDocumentURL(astNode)
-    }
+    DocumentUrlSource() { isDocumentURL(astNode) }
   }
 
   /**
@@ -85,7 +72,7 @@ module XpathInjection {
    */
   class DomXpathSink extends Sink {
     DomXpathSink() {
-      exists (string m | m = "evaluate" or m = "createExpression" |
+      exists(string m | m = "evaluate" or m = "createExpression" |
         this = document().getAMethodCall(m).getArgument(0)
       )
     }
diff --git a/javascript/ql/src/semmle/javascript/security/dataflow/Xxe.qll b/javascript/ql/src/semmle/javascript/security/dataflow/Xxe.qll
index 9245e31284ca..144e1501e595 100644
--- a/javascript/ql/src/semmle/javascript/security/dataflow/Xxe.qll
+++ b/javascript/ql/src/semmle/javascript/security/dataflow/Xxe.qll
@@ -28,13 +28,9 @@ module Xxe {
   class Configuration extends TaintTracking::Configuration {
     Configuration() { this = "Xxe" }
 
-    override predicate isSource(DataFlow::Node source) {
-      source instanceof Source
-    }
+    override predicate isSource(DataFlow::Node source) { source instanceof Source }
 
-    override predicate isSink(DataFlow::Node sink) {
-      sink instanceof Sink
-    }
+    override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
 
     override predicate isSanitizer(DataFlow::Node node) {
       super.isSanitizer(node) or
@@ -51,9 +47,7 @@ module Xxe {
    * An access to `document.location`, considered as a flow source for XXE vulnerabilities.
    */
   class LocationAsSource extends Source, DataFlow::ValueNode {
-    LocationAsSource() {
-      isLocation(astNode)
-    }
+    LocationAsSource() { isLocation(astNode) }
   }
 
   /**
@@ -62,7 +56,7 @@ module Xxe {
    */
   class XmlParsingWithExternalEntityResolution extends Sink, DataFlow::ValueNode {
     XmlParsingWithExternalEntityResolution() {
-      exists (XML::ParserInvocation parse | astNode = parse.getSourceArgument() |
+      exists(XML::ParserInvocation parse | astNode = parse.getSourceArgument() |
         parse.resolvesEntities(XML::ExternalEntity(_))
         or
         parse.resolvesEntities(XML::ParameterEntity(true)) and