diff --git a/Makesurefile b/Makesurefile
index e4ddf8e..8319f36 100644
--- a/Makesurefile
+++ b/Makesurefile
@@ -189,42 +189,42 @@ in_begin && $1 ~ /^split/ { next }
 
 @goal tested_bwk @private
 @depends_on installed_bwk
-  AWK="$(pwd)/soft/bwk" ./makesure_dev tested
+  AWK="$(pwd)/soft/bwk" ./makesure tested
 
 @goal tested_mawk134 @private
 @depends_on installed_mawk134
-  AWK="$(pwd)/soft/mawk134" ./makesure_dev tested
+  AWK="$(pwd)/soft/mawk134" ./makesure tested
 
 @goal tested_gawk51 @private
 @depends_on installed_gawk51
-  AWKLIBPATH="$(pwd)/soft/gawk51_libs" AWK="$(pwd)/soft/gawk51" ./makesure_dev tested
+  AWKLIBPATH="$(pwd)/soft/gawk51_libs" AWK="$(pwd)/soft/gawk51" ./makesure tested
 
 @goal tested_gawk511 @private
 @depends_on installed_gawk511
-  AWKLIBPATH="$(pwd)/soft/gawk511_libs" AWK="$(pwd)/soft/gawk511" ./makesure_dev tested
+  AWKLIBPATH="$(pwd)/soft/gawk511_libs" AWK="$(pwd)/soft/gawk511" ./makesure tested
 
 @goal tested_gawk521 @private
 @depends_on installed_gawk521
-  AWKLIBPATH="$(pwd)/soft/gawk521_libs" AWK="$(pwd)/soft/gawk521" ./makesure_dev tested
+  AWKLIBPATH="$(pwd)/soft/gawk521_libs" AWK="$(pwd)/soft/gawk521" ./makesure tested
 
 @goal tested_goawk @private
 @depends_on installed_goawk
-  AWK="$(pwd)/soft/$GOAWK" ./makesure_dev tested
+  AWK="$(pwd)/soft/$GOAWK" ./makesure tested
 
 @goal tested_goawk_branch @private
 @depends_on installed_goawk_branch
-  AWK="$(pwd)/soft/$GOAWK_BRANCH_EXE" ./makesure_dev tested
+  AWK="$(pwd)/soft/$GOAWK_BRANCH_EXE" ./makesure tested
 
 @goal tested_mawk @private
   if [[ -x /usr/bin/mawk ]]
   then
-    AWK="/usr/bin/mawk" ./makesure_dev tested
+    AWK="/usr/bin/mawk" ./makesure tested
   else
     echo "No default mawk... Skipped testing it."
   fi
 
 #@goal tested_busybox
-#  AWK="busybox awk" ./makesure_dev tested
+#  AWK="busybox awk" ./makesure tested
 
 @goal installed_awks
 @doc installs all awks into ./soft
diff --git a/makesure.awk b/makesure.awk
index a6cf4ee..a78ef9a 100755
--- a/makesure.awk
+++ b/makesure.awk
@@ -424,8 +424,8 @@ body,goalBody,goalBodies,resolvedGoals,exitCode, t0,t1,t2, goalTimed, list) {
     preludeCode = getPreludeCode()
 
     for (i = 0; i in GoalNames; i++) {
-      emptyGoals[goalName] = "" == (body = trim(Code[goalName = GoalNames[i]]))
-
+      body = trim(Code[goalName = GoalNames[i]])
+      emptyGoals[goalName] = "" == body
       goalBody[0] = ""
       addLine(goalBody, preludeCode)
       addLine(goalBody, CodePre[goalName])