diff --git a/src/V3LinkResolve.cpp b/src/V3LinkResolve.cpp
index 773abb4e3..adfeedf7c 100644
--- a/src/V3LinkResolve.cpp
+++ b/src/V3LinkResolve.cpp
@@ -120,7 +120,8 @@ class LinkResolveVisitor final : public VNVisitor {
     }
     void visit(AstVar* nodep) override {
         iterateChildren(nodep);
-        if (m_classp && !nodep->isParam() && !VN_IS(nodep->backp(), SelLoopVars)) nodep->varType(VVarType::MEMBER);
+        if (m_classp && !nodep->isParam() && !VN_IS(nodep->backp(), SelLoopVars))
+            nodep->varType(VVarType::MEMBER);
         if (m_ftaskp) nodep->funcLocal(true);
         if (nodep->isSigModPublic()) {
             nodep->sigModPublic(false);  // We're done with this attribute
diff --git a/src/V3Randomize.cpp b/src/V3Randomize.cpp
index ea5751d23..6a7b00c9e 100644
--- a/src/V3Randomize.cpp
+++ b/src/V3Randomize.cpp
@@ -33,12 +33,13 @@
 
 #include "verilatedos.h"
 
+#include "V3Randomize.h"
+
 #include "V3Ast.h"
 #include "V3Error.h"
 #include "V3FileLine.h"
 #include "V3Global.h"
 #include "V3MemberMap.h"
-#include "V3Randomize.h"
 #include "V3UniqueNames.h"
 
 #include <queue>
@@ -277,8 +278,7 @@ class RandomizeMarkVisitor final : public VNVisitor {
 
     // Process a single constraint during nested constraint cloning
     void processNestedConstraint(AstConstraint* const constrp, AstVarRef* rootVarRefp,
-                                 const std::vector<AstVar*>& newPath, AstClass* targetClassp,
-                                 AstClass* const memberClassp) {
+                                 const std::vector<AstVar*>& newPath, AstClass* targetClassp) {
         std::string pathPrefix = rootVarRefp->name();
         for (AstVar* pathMemberVarp : newPath) {
             pathPrefix += GLOBAL_CONSTRAINT_SEPARATOR + pathMemberVarp->name();
@@ -335,8 +335,7 @@ class RandomizeMarkVisitor final : public VNVisitor {
             // member selections
             nestedClassp->foreachMember(
                 [&](AstClass* const containingClassp, AstConstraint* const constrp) {
-                    processNestedConstraint(constrp, rootVarRefp, newPath, targetClassp,
-                                            containingClassp);
+                    processNestedConstraint(constrp, rootVarRefp, newPath, targetClassp);
                 });
             cloneNestedConstraintsRecurse(rootVarRefp, nestedClassp, newPath, targetClassp);
         }
@@ -571,11 +570,9 @@ class RandomizeMarkVisitor final : public VNVisitor {
                 AstVarRef* rootVarRefp
                     = new AstVarRef{nodep->fileline(), classp, memberVarp, VAccess::READ};
                 std::vector<AstVar*> emptyPath;
-                memberClassp->foreachMember(
-                    [&](AstClass* const containingClassp, AstConstraint* const constrp) {
-                        processNestedConstraint(constrp, rootVarRefp, emptyPath, classp,
-                                                containingClassp);
-                    });
+                memberClassp->foreachMember([&](AstClass* const, AstConstraint* const constrp) {
+                    processNestedConstraint(constrp, rootVarRefp, emptyPath, classp);
+                });
                 cloneNestedConstraintsRecurse(rootVarRefp, memberClassp, emptyPath, classp);
                 // Delete the temporary VarRef created for constraint cloning
                 VL_DO_DANGLING(rootVarRefp->deleteTree(), rootVarRefp);