diff --git a/ql/src/codeql_ql/ast/Ast.qll b/ql/src/codeql_ql/ast/Ast.qll
index 0f59c07f092..60646043ba3 100644
--- a/ql/src/codeql_ql/ast/Ast.qll
+++ b/ql/src/codeql_ql/ast/Ast.qll
@@ -125,6 +125,10 @@ class VarDecl extends TVarDecl, AstNode {
     result = super.getParent()
     or
     result.(Class).getAField() = this
+    or
+    result.(Aggregate).getAnArgument() = this
+    or
+    result.(Quantifier).getAnArgument() = this
   }
 
   Type getType() { toGenerated(result) = var.getChild(0) }
@@ -335,6 +339,8 @@ class Formula extends TFormula, AstNode {
     result = super.getParent()
     or
     result.(Predicate).getBody() = this
+    or
+    result.(Aggregate).getGuard() = this
   }
 }
 
@@ -437,8 +443,7 @@ class Quantifier extends TQuantifier, Formula {
   /** Gets the ith declared argument of this quantifier. */
   VarDecl getArgument(int i) {
     i >= 1 and
-    toGenerated(result) = quant.getChild(i - 1) and
-    exists()
+    toGenerated(result) = quant.getChild(i - 1)
   }
 
   /** Gets an argument of this quantifier. */
@@ -480,6 +485,81 @@ class Forex extends Quantifier {
   override string getAPrimaryQlClass() { result = "Forex" }
 }
 
+class Aggregate extends TAggregate, Expr {
+  Generated::Aggregate agg;
+  Generated::FullAggregateBody body;
+  string kind;
+
+  Aggregate() {
+    this = TAggregate(agg) and
+    kind = agg.getChild(0).(Generated::AggId).getValue() and
+    body = agg.getChild(_)
+  }
+
+  string getKind() { result = kind }
+
+  /** Gets the ith declared argument of this quantifier. */
+  VarDecl getArgument(int i) { toGenerated(result) = body.getChild(i) }
+
+  /** Gets an argument of this quantifier. */
+  VarDecl getAnArgument() { result = this.getArgument(_) }
+
+  Formula getGuard() { toGenerated(result) = body.getGuard() }
+
+  AsExpr getAsExpr(int i) { toGenerated(result) = body.getAsExprs().getChild(i) }
+
+  Expr getOrderBy(int i) { toGenerated(result) = body.getOrderBys().getChild(i).getChild(0) }
+
+  string getOrderbyDirection(int i) {
+    result = body.getOrderBys().getChild(i).getChild(1).(Generated::Direction).getValue()
+  }
+
+  override string getAPrimaryQlClass() { result = "Aggregate[" + kind + "]" }
+}
+
+class Rank extends Aggregate {
+  Rank() { kind = "rank" }
+
+  override string getAPrimaryQlClass() { result = "Rank" }
+
+  /**
+   * The `i` in `rank[i]( | | )`.
+   */
+  Expr getRankExpr() { toGenerated(result) = agg.getChild(1) }
+}
+
+class AsExpr extends TAsExpr, AstNode {
+  Generated::AsExpr asExpr;
+
+  AsExpr() { this = TAsExpr(asExpr) }
+
+  override string getAPrimaryQlClass() { result = "AsExpr" }
+
+  /**
+   * Gets the name the inner expression gets "saved" under.
+   * If such a name exists.
+   */
+  string getAsName() { result = asExpr.getChild(1).(Generated::VarName).getChild().getValue() }
+
+  Expr getInnerExpr() { toGenerated(result) = asExpr.getChild(0) }
+
+  override AstNode getParent() {
+    result = super.getParent()
+    or
+    result.(Aggregate).getAsExpr(_) = this
+  }
+}
+
+class Identifier extends TIdentifier, Expr {
+  Generated::Variable id;
+
+  Identifier() { this = TIdentifier(id) }
+
+  string getName() { result = id.getChild().(Generated::VarName).getChild().getValue() }
+
+  override string getAPrimaryQlClass() { result = "Identifier" }
+}
+
 class Negation extends TNegation, Formula {
   Generated::Negation neg;
 
diff --git a/ql/src/codeql_ql/ast/internal/AstNodes.qll b/ql/src/codeql_ql/ast/internal/AstNodes.qll
index ee0a5be93b1..cc9d0ae624c 100644
--- a/ql/src/codeql_ql/ast/internal/AstNodes.qll
+++ b/ql/src/codeql_ql/ast/internal/AstNodes.qll
@@ -21,6 +21,9 @@ newtype TAstNode =
   TComparisonFormula(Generated::CompTerm comp) or
   TComparisonOp(Generated::Compop op) or
   TQuantifier(Generated::Quantified quant) or
+  TAggregate(Generated::Aggregate agg) or
+  TIdentifier(Generated::Variable var) or
+  TAsExpr(Generated::AsExpr asExpr) or
   TNegation(Generated::Negation neg) or
   TAddExpr(Generated::AddExpr addexp) or
   TLiteral(Generated::Literal lit)
@@ -29,7 +32,7 @@ class TFormula = TDisjunction or TConjunction or TComparisonFormula or TQuantifi
 
 class TBinOpExpr = TAddExpr;
 
-class TExpr = TBinOpExpr or TLiteral;
+class TExpr = TBinOpExpr or TLiteral or TAggregate or TIdentifier;
 
 Generated::AstNode toGeneratedFormula(AST::AstNode n) {
   n = TConjunction(result) or
@@ -37,6 +40,8 @@ Generated::AstNode toGeneratedFormula(AST::AstNode n) {
   n = TComparisonFormula(result) or
   n = TComparisonOp(result) or
   n = TQuantifier(result) or
+  n = TAggregate(result) or
+  n = TIdentifier(result) or
   n = TNegation(result)
 }
 
@@ -73,6 +78,8 @@ Generated::AstNode toGenerated(AST::AstNode n) {
   n = TType(result)
   or
   n = TLiteral(result)
+  or
+  n = TAsExpr(result)
 }
 
 class TPredicate = TCharPred or TClasslessPredicate or TClassPredicate;
diff --git a/ql/src/codeql_ql/ast/internal/TreeSitter.qll b/ql/src/codeql_ql/ast/internal/TreeSitter.qll
index c9684cb2e6e..e353a0678f3 100644
--- a/ql/src/codeql_ql/ast/internal/TreeSitter.qll
+++ b/ql/src/codeql_ql/ast/internal/TreeSitter.qll
@@ -123,6 +123,11 @@ module Generated {
     override AstNode getAFieldOrChild() { as_expr_child(this, _, result) }
   }
 
+  AsExpr childThing(int i, AstNode child) {
+    result.getChild(i) = child and
+    i != 0
+  }
+
   class AsExprs extends @as_exprs, AstNode {
     override string getAPrimaryQlClass() { result = "AsExprs" }