diff --git a/src/meta/meta.c b/src/meta/meta.c
index 5148dc0d..f164821a 100644
--- a/src/meta/meta.c
+++ b/src/meta/meta.c
@@ -246,7 +246,6 @@ void BuildEntryPoint(WaveLaneCtx *lane)
 {
     Arena *perm = PermArena();
 
-
     //////////////////////////////
     //- Dirty check
 
@@ -300,11 +299,11 @@ void BuildEntryPoint(WaveLaneCtx *lane)
     };
     CmdLineArgs cmdline = ZI;
     {
+        CommandlineArg layer_arg = CommandlineArgFromName(Lit("layer"));
         String layer_name = ZI;
-        CommandlineArg arg = CommandlineArgFromName(Lit("layer"));
-        if (arg.name.len != 0)
+        if (layer_arg.name.len != 0)
         {
-            layer_name = arg.value;
+            layer_name = layer_arg.value;
         }
         else
         {
@@ -312,14 +311,18 @@ void BuildEntryPoint(WaveLaneCtx *lane)
         }
         if (layer_name.len == 0)
         {
-            if (lane->idx == 0) EchoLine(Lit("No layer supplied, assuming \"pp\" build"));
             layer_name = Lit("pp");
+            if (lane->idx == 0)
+            {
+                EchoLine(Lit("No layer supplied, assuming \"pp\" build"));
+            }
         }
         cmdline.leaf_layer_name = layer_name;
-        if (lane->idx == 0)
-        {
-            if (lane->idx == 0) EchoLine(StringF(perm, "Building layer \"%F\"", FmtString(cmdline.leaf_layer_name)));
-        }
+    }
+
+    if (lane->idx == 0)
+    {
+        EchoLine(StringF(perm, "Building layer \"%F\"", FmtString(cmdline.leaf_layer_name)));
     }
 
     //////////////////////////////