diff --git a/composer.json b/composer.json
index d3acb55..5d3a60a 100644
--- a/composer.json
+++ b/composer.json
@@ -3,7 +3,7 @@
     "name": "pre/immutable-classes",
     "license": "MIT",
     "require": {
-        "pre/plugin": "^0.10.0"
+        "pre/plugin": "^0.11.0"
     },
     "autoload": {
         "psr-4": {
@@ -14,6 +14,8 @@
         "phpunit/phpunit": "^5.0|^6.0"
     },
     "extra": {
-        "macros": ["source/macros.yay"]
+        "macros": [
+            "source/macros.yay"
+        ]
     }
 }
diff --git a/source/macros.yay b/source/macros.yay
index 3e02d15..701c2b0 100644
--- a/source/macros.yay
+++ b/source/macros.yay
@@ -1,28 +1,28 @@
 <?php
 
-macro {
-    immutable class ·ns()·class {
-        ···body
+$(macro) {
+    immutable class $(ns() as class) {
+        $(layer() as body)
     }
 } >> {
-    class ·class {
+    class $(class) {
         use \Pre\ImmutableClasses\ImmutableClassesTrait;
 
-        ···body
+        $(body)
     }
 }
 
-macro ·unsafe {
-    function __call(···parameters) {
+$(macro :unsafe) {
+    function __call($(layer() as parameters)) {
         immutability;
-        ···body
+        $(layer() as body)
     }
 } >> {
-    function __call(···parameters) {
-        if ($result = $this->handleCallImmutableClassSetters(···parameters)) {
+    function __call($(parameters)) {
+        if ($result = $this->handleCallImmutableClassSetters($(parameters))) {
             return $result;
         }
 
-        ···body
+        $(body)
     }
 }