diff --git a/src/V3EmitC.cpp b/src/V3EmitC.cpp
index be8de4508..e8e9a1e8f 100644
--- a/src/V3EmitC.cpp
+++ b/src/V3EmitC.cpp
@@ -154,6 +154,58 @@ public:
         }
     }
 
+    void emitParams(AstNodeModule* modp, bool init, bool* firstp, string& sectionr) {
+        for (AstNode* nodep = modp->stmtsp(); nodep; nodep = nodep->nextp()) {
+            if (const AstVar* varp = VN_CAST(nodep, Var)) {
+                if (varp->isParam() && (varp->isUsedParam() || varp->isSigPublic())) {
+                    if (!init && sectionr != "") {
+                        puts(sectionr);
+                        sectionr = "";
+                    }
+                    UASSERT_OBJ(varp->valuep(), nodep, "No init for a param?");
+                    // These should be static const values, however microsloth VC++ doesn't
+                    // support them.  They also cause problems with GDB under GCC2.95.
+                    if (varp->isWide()) {  // Unsupported for output
+                        if (!init) {
+                            putsDecoration("// enum WData " + varp->nameProtect() + "  //wide");
+                        }
+                    } else if (varp->isString()) {
+                        if (init) {
+                            emitCtorSep(firstp);
+                            puts(protect("var_" + varp->name()) + " (");
+                            iterateAndNextNull(varp->valuep());
+                            puts(")");
+                        } else {
+                            puts("const std::string " + protect("var_" + varp->name()) + ";\n");
+                        }
+                    } else if (!VN_IS(varp->valuep(), Const)) {  // Unsupported for output
+                        // putsDecoration("// enum ..... "+varp->nameProtect()
+                        //               +"not simple value, see variable above instead");
+                    } else if (VN_IS(varp->dtypep(), BasicDType)
+                               && VN_CAST(varp->dtypep(), BasicDType)
+                                      ->isOpaque()) {  // Can't put out e.g. doubles
+                    } else {
+                        if (init) {
+                            emitCtorSep(firstp);
+                            puts(protect("var_" + varp->name()) + " (");
+                            iterateAndNextNull(varp->valuep());
+                            puts(")");
+                        } else {
+                            // enum
+                            puts(varp->isQuad() ? "enum _QData" : "enum _IData");
+                            puts("" + varp->nameProtect() + " { " + varp->nameProtect() + " = ");
+                            iterateAndNextNull(varp->valuep());
+                            puts("};\n");
+                            // var
+                            puts(varp->isQuad() ? "const QData " : "const IData ");
+                            puts(protect("var_" + varp->name()) + ";\n");
+                        }
+                    }
+                }
+            }
+        }
+    }
+
     struct CmpName {
         inline bool operator()(const AstNode* lhsp, const AstNode* rhsp) const {
             return lhsp->name() < rhsp->name();
@@ -2311,6 +2363,8 @@ void EmitCImp::emitCtorImp(AstNodeModule* modp) {
     }
     emitVarCtors(&first);
     if (modp->isTop() && v3Global.opt.mtasks()) emitMTaskVertexCtors(&first);
+    string section("");
+    emitParams(modp, true, &first, section /*ref*/);
     puts(" {\n");
     emitCellCtors(modp);
     emitSensitives();
@@ -3041,44 +3095,8 @@ void EmitCImp::emitInt(AstNodeModule* modp) {
     ofp()->putsPrivate(false);  // public:
     emitVarList(modp->stmtsp(), EVL_CLASS_PAR, "",
                 section /*ref*/);  // Only those that are non-CONST
-    for (AstNode* nodep = modp->stmtsp(); nodep; nodep = nodep->nextp()) {
-        if (const AstVar* varp = VN_CAST(nodep, Var)) {
-            if (varp->isParam() && (varp->isUsedParam() || varp->isSigPublic())) {
-                if (section != "") {
-                    puts(section);
-                    section = "";
-                }
-                UASSERT_OBJ(varp->valuep(), nodep, "No init for a param?");
-                // These should be static const values, however microsloth VC++ doesn't
-                // support them.  They also cause problems with GDB under GCC2.95.
-                if (varp->isWide()) {  // Unsupported for output
-                    putsDecoration("// enum WData " + varp->nameProtect() + "  //wide");
-                } else if (varp->isString()) {
-                    puts("const std::string " + protect("var_" + varp->name()) + " = ");
-                    iterateAndNextNull(varp->valuep());
-                    puts(";");
-                } else if (!VN_IS(varp->valuep(), Const)) {  // Unsupported for output
-                    // putsDecoration("// enum ..... "+varp->nameProtect()
-                    //               +"not simple value, see variable above instead");
-                } else if (VN_IS(varp->dtypep(), BasicDType)
-                           && VN_CAST(varp->dtypep(), BasicDType)
-                                  ->isOpaque()) {  // Can't put out e.g. doubles
-                } else {
-                    // enum
-                    puts(varp->isQuad() ? "enum _QData" : "enum _IData");
-                    puts("" + varp->nameProtect() + " { " + varp->nameProtect() + " = ");
-                    iterateAndNextNull(varp->valuep());
-                    puts("};\n");
-                    // var
-                    puts(varp->isQuad() ? "const QData" : "const IData");
-                    puts(" var_" + varp->nameProtect() + " = ");
-                    iterateAndNextNull(varp->valuep());
-                    puts(";");
-                }
-                puts("\n");
-            }
-        }
-    }
+    bool first = true;
+    emitParams(modp, false, &first, section /*ref*/);
 
     if (!VN_IS(modp, Class)) {
         puts("\n// CONSTRUCTORS\n");
diff --git a/src/V3EmitCSyms.cpp b/src/V3EmitCSyms.cpp
index fb6221245..978c56e2e 100644
--- a/src/V3EmitCSyms.cpp
+++ b/src/V3EmitCSyms.cpp
@@ -332,9 +332,7 @@ class EmitCSyms : EmitCBaseVisitor {
     virtual void visit(AstVar* nodep) VL_OVERRIDE {
         nameCheck(nodep);
         iterateChildren(nodep);
-        if (nodep->isSigUserRdPublic()) {
-            m_modVars.push_back(make_pair(m_modp, nodep));
-        }
+        if (nodep->isSigUserRdPublic()) { m_modVars.push_back(make_pair(m_modp, nodep)); }
     }
     virtual void visit(AstCoverDecl* nodep) VL_OVERRIDE {
         // Assign numbers to all bins, so we know how big of an array to use
@@ -805,14 +803,20 @@ void EmitCSyms::emitSymImp() {
                 varName += protect(varp->name());
             }
 
-            if (varp->isParam() && (varp->vlEnumType() == "VLVT_STRING")) {
-                puts(", const_cast<void*>(static_cast<const void*>(");
-                puts(varName.c_str());
-                puts(".c_str())), ");
+            if (varp->isParam()) {
+                if (varp->vlEnumType() == "VLVT_STRING") {
+                    puts(", const_cast<void*>(static_cast<const void*>(");
+                    puts(varName.c_str());
+                    puts(".c_str())), ");
+                } else {
+                    puts(", const_cast<void*>(static_cast<const void*>(&(");
+                    puts(varName.c_str());
+                    puts("))), ");
+                }
             } else {
-                puts(", const_cast<void*>(static_cast<const void*>(&(");
+                puts(", &(");
                 puts(varName.c_str());
-                puts("))), ");
+                puts("), ");
             }
 
             puts(varp->isParam() ? "true" : "false");