diff --git a/src/script_opt/CPP/Stmts.cc b/src/script_opt/CPP/Stmts.cc
index dc252a6273..40d3b27eb6 100644
--- a/src/script_opt/CPP/Stmts.cc
+++ b/src/script_opt/CPP/Stmts.cc
@@ -82,7 +82,7 @@ void CPPCompile::GenInitStmt(const InitStmt* init) {
         auto type_type = TypeType(t);
         auto type_ind = GenTypeName(t);
 
-        if ( ! locals.contains(aggr.get()) ) {
+        if ( ! locals.contains(aggr) ) {
             // fprintf(stderr, "aggregate %s unused\n", obj_desc(aggr.get()).c_str());
             continue;
         }
diff --git a/src/script_opt/Expr.cc b/src/script_opt/Expr.cc
index 2e0be43b46..4f15b1d6b8 100644
--- a/src/script_opt/Expr.cc
+++ b/src/script_opt/Expr.cc
@@ -2396,7 +2396,7 @@ bool LambdaExpr::IsReduced(Reducer* c) const {
     for ( auto& cp : *captures ) {
         auto& cid = cp.Id();
 
-        if ( ! private_captures.contains(cid.get()) && ! c->ID_IsReduced(cid) )
+        if ( ! private_captures.contains(cid) && ! c->ID_IsReduced(cid) )
             return NonReduced(this);
     }
 
@@ -2424,7 +2424,7 @@ void LambdaExpr::UpdateCaptures(Reducer* c) {
         for ( auto& cp : *captures ) {
             auto& cid = cp.Id();
 
-            if ( ! private_captures.contains(cid.get()) )
+            if ( ! private_captures.contains(cid) )
                 cp.SetID(c->UpdateID(cid));
         }
 
diff --git a/src/script_opt/Inline.cc b/src/script_opt/Inline.cc
index 7fef2bb366..73d78d3b92 100644
--- a/src/script_opt/Inline.cc
+++ b/src/script_opt/Inline.cc
@@ -420,7 +420,7 @@ ExprPtr Inliner::DoInline(ScriptFuncPtr sf, StmtPtr body, ListExprPtr args, Scop
     for ( int i = 0; i < nparam; ++i ) {
         auto& vi = vars[i];
         params.emplace_back(vi);
-        param_is_modified.emplace_back((pf->Assignees().contains(vi.get())));
+        param_is_modified.emplace_back((pf->Assignees().contains(vi)));
     }
 
     // Recursively inline the body.  This is safe to do because we've
diff --git a/src/script_opt/Reduce.cc b/src/script_opt/Reduce.cc
index 4a43cad081..4f4cf0a05f 100644
--- a/src/script_opt/Reduce.cc
+++ b/src/script_opt/Reduce.cc
@@ -330,7 +330,7 @@ StmtPtr Reducer::GenParam(const IDPtr& id, ExprPtr rhs, bool is_modified) {
     param->SetLocationInfo(rhs->GetLocationInfo());
     auto rhs_id = rhs->Tag() == EXPR_NAME ? rhs->AsNameExpr()->IdPtr() : nullptr;
 
-    if ( rhs_id && ! pf->Locals().contains(rhs_id.get()) && ! rhs_id->IsConst() )
+    if ( rhs_id && ! pf->Locals().contains(rhs_id) && ! rhs_id->IsConst() )
         // It's hard to guarantee the RHS won't change during
         // the inline block's execution.
         is_modified = true;
@@ -832,20 +832,20 @@ IDPtr Reducer::GenLocal(const IDPtr& orig) {
         local_id->GetOptInfo()->SetTemp();
 
     IDPtr prev;
-    if ( orig_to_new_locals.count(orig) )
+    if ( orig_to_new_locals.contains(orig) )
         prev = orig_to_new_locals[orig];
 
     AddNewLocal(local_id);
     om.AddObj(orig.get());
     orig_to_new_locals[orig] = local_id;
 
-    if ( ! block_locals.empty() && ret_vars.count(orig) == 0 )
+    if ( ! block_locals.empty() && ! ret_vars.contains(orig) )
         block_locals.back()[orig] = prev;
 
     return local_id;
 }
 
-bool Reducer::IsNewLocal(const IDPtr& id) const { return new_locals.count(id) != 0; }
+bool Reducer::IsNewLocal(const IDPtr& id) const { return new_locals.contains(id); }
 
 std::shared_ptr<TempVar> Reducer::FindTemporary(const IDPtr& id) const {
     auto tmp = ids_to_temps.find(id);
diff --git a/src/script_opt/Reduce.h b/src/script_opt/Reduce.h
index 822d0ed026..b03a706752 100644
--- a/src/script_opt/Reduce.h
+++ b/src/script_opt/Reduce.h
@@ -81,7 +81,7 @@ public:
     bool IsNewLocal(const IDPtr& id) const;
 
     bool IsTemporary(const IDPtr& id) const { return FindTemporary(id) != nullptr; }
-    bool IsParamTemp(const IDPtr& id) const { return param_temps.count(id) > 0; }
+    bool IsParamTemp(const IDPtr& id) const { return param_temps.contains(id); }
 
     bool IsConstantVar(const IDPtr& id) const { return constant_vars.find(id) != constant_vars.end(); }
 
diff --git a/src/script_opt/Stmt.cc b/src/script_opt/Stmt.cc
index 24254dbb7f..8b16f0f3a9 100644
--- a/src/script_opt/Stmt.cc
+++ b/src/script_opt/Stmt.cc
@@ -1101,7 +1101,7 @@ bool WhenInfo::HasUnreducedIDs(Reducer* c) const {
     for ( auto& cp : *cl ) {
         const auto& cid = cp.Id();
 
-        if ( when_new_locals.count(cid) == 0 && ! c->ID_IsReduced(cp.Id()) )
+        if ( ! when_new_locals.contains(cid) && ! c->ID_IsReduced(cp.Id()) )
             return true;
     }
 
@@ -1115,7 +1115,7 @@ bool WhenInfo::HasUnreducedIDs(Reducer* c) const {
 void WhenInfo::UpdateIDs(Reducer* c) {
     for ( auto& cp : *cl ) {
         auto& cid = cp.Id();
-        if ( when_new_locals.count(cid) == 0 )
+        if ( ! when_new_locals.contains(cid) )
             cp.SetID(c->UpdateID(cid));
     }
 
diff --git a/src/script_opt/ZAM/Expr.cc b/src/script_opt/ZAM/Expr.cc
index 0afe803ef8..785665f1f6 100644
--- a/src/script_opt/ZAM/Expr.cc
+++ b/src/script_opt/ZAM/Expr.cc
@@ -951,7 +951,7 @@ const ZAMStmt ZAMCompiler::BuildLambda(int n_slot, ExprPtr e) {
     for ( int i = 0; i < ncaptures; ++i ) {
         auto& id_i = (*captures)[i].Id();
 
-        if ( pf->WhenLocals().count(id_i) > 0 )
+        if ( pf->WhenLocals().contains(id_i) )
             aux->Add(i, nullptr);
         else
             aux->Add(i, FrameSlot(id_i), id_i->GetType());