diff --git a/src/ioc/dbStatic/dbLexRoutines.c b/src/ioc/dbStatic/dbLexRoutines.c
index 6f1466229..cf2406556 100644
--- a/src/ioc/dbStatic/dbLexRoutines.c
+++ b/src/ioc/dbStatic/dbLexRoutines.c
@@ -230,7 +230,7 @@ static long dbReadCOM(DBBASE **ppdbbase,const char *filename, FILE *fp,
     }
     pinputFile = dbCalloc(1,sizeof(inputFile));
     if(filename) {
-	pinputFile->filename = macEnvExpand(filename, NULL);
+	pinputFile->filename = macEnvExpand(filename);
     }
     if(!fp) {
 	FILE	*fp1;
@@ -382,7 +382,7 @@ static void dbIncludeNew(char *filename)
     FILE	*fp;
 
     pinputFile = dbCalloc(1,sizeof(inputFile));
-    pinputFile->filename = macEnvExpand(filename, NULL);
+    pinputFile->filename = macEnvExpand(filename);
     pinputFile->path = dbOpenFile(pdbbase, pinputFile->filename, &fp);
     if (!fp) {
         epicsPrintf("Can't open include file \"%s\"\n", filename);
diff --git a/src/ioc/dbtemplate/msi.c b/src/ioc/dbtemplate/msi.c
index d3acba707..782161a7f 100644
--- a/src/ioc/dbtemplate/msi.c
+++ b/src/ioc/dbtemplate/msi.c
@@ -582,10 +582,10 @@ static int substituteGetNextSet(subInfo *psubInfo,char **filename)
         free(psubInfo->filename);
         if(psubFile->string[0]=='"'&&psubFile->string[strlen(psubFile->string)-1]=='"') {
             psubFile->string[strlen(psubFile->string)-1]='\0';
-            psubInfo->filename = macEnvExpand(psubFile->string+1, NULL);
+            psubInfo->filename = macEnvExpand(psubFile->string+1);
         }
         else {
-            psubInfo->filename = macEnvExpand(psubFile->string, NULL);
+            psubInfo->filename = macEnvExpand(psubFile->string);
         }
         while(subGetNextToken(psubFile)==tokenSeparater);
         if(psubFile->token!=tokenLBrace) {
diff --git a/src/libCom/iocsh/iocsh.cpp b/src/libCom/iocsh/iocsh.cpp
index 9bb718e0c..a7054b33d 100644
--- a/src/libCom/iocsh/iocsh.cpp
+++ b/src/libCom/iocsh/iocsh.cpp
@@ -585,7 +585,7 @@ iocshBody (const char *pathname, const char *commandLine, const char* macros)
          * Expand macros
          */
         free(line);
-        if ((line = macEnvExpand(raw, macros)) == NULL)
+        if ((line = macDefExpand(raw, macros)) == NULL)
             continue;
 
         /*
diff --git a/src/libCom/test/macEnvExpandTest.c b/src/libCom/test/macEnvExpandTest.c
index e37af38f7..b56cc366a 100644
--- a/src/libCom/test/macEnvExpandTest.c
+++ b/src/libCom/test/macEnvExpandTest.c
@@ -23,7 +23,7 @@
 
 static void check(const char *str, const char *expect)
 {
-    char *got = macEnvExpand(str, NULL);
+    char *got = macEnvExpand(str);
     int pass = -1;
 
     if (expect && !got) {