diff --git a/powershell/ql/lib/semmle/code/powershell/AssignmentStatement.qll b/powershell/ql/lib/semmle/code/powershell/AssignmentStatement.qll
index 1a6dce03560..10bfaed2066 100644
--- a/powershell/ql/lib/semmle/code/powershell/AssignmentStatement.qll
+++ b/powershell/ql/lib/semmle/code/powershell/AssignmentStatement.qll
@@ -1,6 +1,6 @@
 import powershell
 
-class AssignStmt extends @assignment_statement, Stmt {
+class AssignStmt extends @assignment_statement, PipelineBase {
   override SourceLocation getLocation() { assignment_statement_location(this, result) }
 
   int getKind() { assignment_statement(this, result, _, _) }
diff --git a/powershell/ql/lib/semmle/code/powershell/CommandBase.qll b/powershell/ql/lib/semmle/code/powershell/CommandBase.qll
index 9f78e71e012..2ca1342a826 100644
--- a/powershell/ql/lib/semmle/code/powershell/CommandBase.qll
+++ b/powershell/ql/lib/semmle/code/powershell/CommandBase.qll
@@ -1,3 +1,3 @@
 import powershell
 
-class CmdBase extends @command_base, Stmt { }
+class CmdBase extends @command_base, Chainable { }