diff --git a/library/Icinga/Less/Call.php b/library/Icinga/Less/Call.php
index 0e6074dbe..449ede622 100644
--- a/library/Icinga/Less/Call.php
+++ b/library/Icinga/Less/Call.php
@@ -1,5 +1,7 @@
 <?php
 
+/* Icinga Web 2 | (c) 2022 Icinga GmbH | GPLv2+ */
+
 namespace Icinga\Less;
 
 use Less_Tree_Call;
@@ -59,6 +61,7 @@ class Call extends Less_Tree_Call
                         }
 
                         $arg->value[0] = $vr;
+
                         break;
                     }
                 }
diff --git a/library/Icinga/Less/ColorProp.php b/library/Icinga/Less/ColorProp.php
index b6fe6d2e2..3f83c5eee 100644
--- a/library/Icinga/Less/ColorProp.php
+++ b/library/Icinga/Less/ColorProp.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2022 Icinga Development Team | GPLv2+ */
+/* Icinga Web 2 | (c) 2022 Icinga GmbH | GPLv2+ */
 
 namespace Icinga\Less;
 
diff --git a/library/Icinga/Less/ColorPropOrVariable.php b/library/Icinga/Less/ColorPropOrVariable.php
index 8920999bb..791867495 100644
--- a/library/Icinga/Less/ColorPropOrVariable.php
+++ b/library/Icinga/Less/ColorPropOrVariable.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2022 Icinga Development Team | GPLv2+ */
+/* Icinga Web 2 | (c) 2022 Icinga GmbH | GPLv2+ */
 
 namespace Icinga\Less;
 
diff --git a/library/Icinga/Less/DeferredColorProp.php b/library/Icinga/Less/DeferredColorProp.php
index becb04251..c9c39adf5 100644
--- a/library/Icinga/Less/DeferredColorProp.php
+++ b/library/Icinga/Less/DeferredColorProp.php
@@ -1,5 +1,7 @@
 <?php
 
+/* Icinga Web 2 | (c) 2022 Icinga GmbH | GPLv2+ */
+
 namespace Icinga\Less;
 
 use Less_Exception_Compiler;
@@ -79,7 +81,7 @@ class DeferredColorProp extends Less_Tree_Variable
             return $this;
         }
 
-        if ($this->evaluating) {
+        if ($this->evaluating) { // Just like the parent method
             throw new Less_Exception_Compiler(
                 "Recursive variable definition for " . $this->name,
                 null,
diff --git a/library/Icinga/Less/LightMode.php b/library/Icinga/Less/LightMode.php
index 30197614a..7bdf6f575 100644
--- a/library/Icinga/Less/LightMode.php
+++ b/library/Icinga/Less/LightMode.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2022 Icinga Development Team | GPLv2+ */
+/* Icinga Web 2 | (c) 2022 Icinga GmbH | GPLv2+ */
 
 namespace Icinga\Less;
 
diff --git a/library/Icinga/Less/LightModeCall.php b/library/Icinga/Less/LightModeCall.php
index 65cdbfe0d..d899e3ce9 100644
--- a/library/Icinga/Less/LightModeCall.php
+++ b/library/Icinga/Less/LightModeCall.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2022 Icinga Development Team | GPLv2+ */
+/* Icinga Web 2 | (c) 2022 Icinga GmbH | GPLv2+ */
 
 namespace Icinga\Less;
 
diff --git a/library/Icinga/Less/LightModeDefinition.php b/library/Icinga/Less/LightModeDefinition.php
index 63e1baaf5..929e95c07 100644
--- a/library/Icinga/Less/LightModeDefinition.php
+++ b/library/Icinga/Less/LightModeDefinition.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2022 Icinga Development Team | GPLv2+ */
+/* Icinga Web 2 | (c) 2022 Icinga GmbH | GPLv2+ */
 
 namespace Icinga\Less;
 
diff --git a/library/Icinga/Less/LightModeTrait.php b/library/Icinga/Less/LightModeTrait.php
index efdffdc93..d32826586 100644
--- a/library/Icinga/Less/LightModeTrait.php
+++ b/library/Icinga/Less/LightModeTrait.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2022 Icinga Development Team | GPLv2+ */
+/* Icinga Web 2 | (c) 2022 Icinga GmbH | GPLv2+ */
 
 namespace Icinga\Less;
 
diff --git a/library/Icinga/Less/LightModeVisitor.php b/library/Icinga/Less/LightModeVisitor.php
index 2b06234f4..35758b4ac 100644
--- a/library/Icinga/Less/LightModeVisitor.php
+++ b/library/Icinga/Less/LightModeVisitor.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2022 Icinga Development Team | GPLv2+ */
+/* Icinga Web 2 | (c) 2022 Icinga GmbH | GPLv2+ */
 
 namespace Icinga\Less;
 
diff --git a/library/Icinga/Less/Visitor.php b/library/Icinga/Less/Visitor.php
index 030ea7bc9..2b574febf 100644
--- a/library/Icinga/Less/Visitor.php
+++ b/library/Icinga/Less/Visitor.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2022 Icinga Development Team | GPLv2+ */
+/* Icinga Web 2 | (c) 2022 Icinga GmbH | GPLv2+ */
 
 namespace Icinga\Less;
 
@@ -65,13 +65,7 @@ CSS;
 
     public function visitCall($c)
     {
-        if ($c->name === 'var') {
-            if ($this->callingVar !== false) {
-                throw new LogicException('Already calling var');
-            }
-
-            $this->callingVar = spl_object_hash($c);
-        } else {
+        if ($c->name !== 'var') {
             // We need to use our own tree call class , so that we can precompile the arguments before making
             // the actual LESS function calls. Otherwise, it will produce lots of invalid argument exceptions!
             $c = Call::fromCall($c);
@@ -80,13 +74,6 @@ CSS;
         return $c;
     }
 
-    public function visitCallOut($c)
-    {
-        if ($this->callingVar !== false && $this->callingVar === spl_object_hash($c)) {
-            $this->callingVar = false;
-        }
-    }
-
     public function visitDetachedRuleset($drs)
     {
         if ($this->variableOrigin->name === '@' . static::LIGHT_MODE_NAME) {
@@ -194,7 +181,7 @@ CSS;
 
     public function visitVariable($v)
     {
-        if ($this->callingVar !== false || $this->definingVariable !== false) {
+        if ($this->definingVariable !== false) {
             return $v;
         }
 
@@ -205,6 +192,7 @@ CSS;
     public function visitColor($c)
     {
         if ($this->definingVariable !== false) {
+            // Make sure that all less tree colors do have a proper name
             $c->name = $this->variableOrigin->name;
         }