diff --git a/Library/Optimizers/FunctionCall/AddslashesOptimizer.php b/Library/Optimizers/FunctionCall/AddslashesOptimizer.php
index 934d99f7ae..5673e4ed13 100644
--- a/Library/Optimizers/FunctionCall/AddslashesOptimizer.php
+++ b/Library/Optimizers/FunctionCall/AddslashesOptimizer.php
@@ -65,7 +65,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         }
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output('zephir_addslashes('.$symbol.', '.$resolvedParams[0].' TSRMLS_CC);');
+        $context->codePrinter->output('zephir_addslashes('.$symbol.', '.$resolvedParams[0].');');
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
diff --git a/Library/Optimizers/FunctionCall/ArrayKeyExistsOptimizer.php b/Library/Optimizers/FunctionCall/ArrayKeyExistsOptimizer.php
index 9e00be4471..30e3f65c04 100644
--- a/Library/Optimizers/FunctionCall/ArrayKeyExistsOptimizer.php
+++ b/Library/Optimizers/FunctionCall/ArrayKeyExistsOptimizer.php
@@ -48,6 +48,6 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
 
         //Note: the first parameter is key in php array_key_exists
-        return new CompiledExpression('bool', 'zephir_array_key_exists('.$resolvedParams[1].', '.$resolvedParams[0].' TSRMLS_CC)', $expression);
+        return new CompiledExpression('bool', 'zephir_array_key_exists('.$resolvedParams[1].', '.$resolvedParams[0].')', $expression);
     }
 }
diff --git a/Library/Optimizers/FunctionCall/ArrayKeysOptimizer.php b/Library/Optimizers/FunctionCall/ArrayKeysOptimizer.php
index 70a3757a15..fabc0c4ba3 100644
--- a/Library/Optimizers/FunctionCall/ArrayKeysOptimizer.php
+++ b/Library/Optimizers/FunctionCall/ArrayKeysOptimizer.php
@@ -64,7 +64,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         }
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output('zephir_array_keys('.$symbol.', '.$resolvedParams[0].' TSRMLS_CC);');
+        $context->codePrinter->output('zephir_array_keys('.$symbol.', '.$resolvedParams[0].');');
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
diff --git a/Library/Optimizers/FunctionCall/ArrayMergeOptimizer.php b/Library/Optimizers/FunctionCall/ArrayMergeOptimizer.php
index 382e51787b..9677b889e5 100644
--- a/Library/Optimizers/FunctionCall/ArrayMergeOptimizer.php
+++ b/Library/Optimizers/FunctionCall/ArrayMergeOptimizer.php
@@ -63,7 +63,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         }
         $symbol = $context->backend->getVariableCode($symbolVariable);
         $resolveParam = $this->createParamResolver($context);
-        $context->codePrinter->output('zephir_fast_array_merge('.$symbol.', '.$resolveParam($resolvedParams[0]).', '.$resolveParam($resolvedParams[1]).' TSRMLS_CC);');
+        $context->codePrinter->output('zephir_fast_array_merge('.$symbol.', '.$resolveParam($resolvedParams[0]).', '.$resolveParam($resolvedParams[1]).');');
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
diff --git a/Library/Optimizers/FunctionCall/BasenameOptimizer.php b/Library/Optimizers/FunctionCall/BasenameOptimizer.php
index 9ba750609d..88085f6bdd 100644
--- a/Library/Optimizers/FunctionCall/BasenameOptimizer.php
+++ b/Library/Optimizers/FunctionCall/BasenameOptimizer.php
@@ -64,7 +64,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         }
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output('zephir_basename('.$symbol.', '.$resolvedParams[0].' TSRMLS_CC);');
+        $context->codePrinter->output('zephir_basename('.$symbol.', '.$resolvedParams[0].');');
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
diff --git a/Library/Optimizers/FunctionCall/CeilOptimizer.php b/Library/Optimizers/FunctionCall/CeilOptimizer.php
index 6df97d6695..6f624831a7 100644
--- a/Library/Optimizers/FunctionCall/CeilOptimizer.php
+++ b/Library/Optimizers/FunctionCall/CeilOptimizer.php
@@ -47,6 +47,6 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
 
-        return new CompiledExpression('double', 'zephir_ceil('.$resolvedParams[0].' TSRMLS_CC)', $expression);
+        return new CompiledExpression('double', 'zephir_ceil('.$resolvedParams[0].')', $expression);
     }
 }
diff --git a/Library/Optimizers/FunctionCall/ClassExistsOptimizer.php b/Library/Optimizers/FunctionCall/ClassExistsOptimizer.php
index 9551bff9b2..64b492d577 100644
--- a/Library/Optimizers/FunctionCall/ClassExistsOptimizer.php
+++ b/Library/Optimizers/FunctionCall/ClassExistsOptimizer.php
@@ -57,6 +57,6 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $context->headersManager->add('kernel/object');
 
-        return new CompiledExpression('bool', 'zephir_class_exists('.$resolvedParams[0].', '.$autoload.' TSRMLS_CC)', $expression);
+        return new CompiledExpression('bool', 'zephir_class_exists('.$resolvedParams[0].', '.$autoload.')', $expression);
     }
 }
diff --git a/Library/Optimizers/FunctionCall/CompareMtimeOptimizer.php b/Library/Optimizers/FunctionCall/CompareMtimeOptimizer.php
index 6f444233ac..cd66dd0f09 100644
--- a/Library/Optimizers/FunctionCall/CompareMtimeOptimizer.php
+++ b/Library/Optimizers/FunctionCall/CompareMtimeOptimizer.php
@@ -52,6 +52,6 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
 
-        return new CompiledExpression('bool', 'zephir_compare_mtime('.$resolvedParams[0].', '.$resolvedParams[1].' TSRMLS_CC)', $expression);
+        return new CompiledExpression('bool', 'zephir_compare_mtime('.$resolvedParams[0].', '.$resolvedParams[1].')', $expression);
     }
 }
diff --git a/Library/Optimizers/FunctionCall/CountOptimizer.php b/Library/Optimizers/FunctionCall/CountOptimizer.php
index 7cc04747a1..c6e240bd24 100644
--- a/Library/Optimizers/FunctionCall/CountOptimizer.php
+++ b/Library/Optimizers/FunctionCall/CountOptimizer.php
@@ -42,6 +42,6 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
 
-        return new CompiledExpression('int', 'zephir_fast_count_int('.$resolvedParams[0].' TSRMLS_CC)', $expression);
+        return new CompiledExpression('int', 'zephir_fast_count_int('.$resolvedParams[0].')', $expression);
     }
 }
diff --git a/Library/Optimizers/FunctionCall/CreateArrayOptimizer.php b/Library/Optimizers/FunctionCall/CreateArrayOptimizer.php
index c52054b5e7..df282e2db0 100644
--- a/Library/Optimizers/FunctionCall/CreateArrayOptimizer.php
+++ b/Library/Optimizers/FunctionCall/CreateArrayOptimizer.php
@@ -72,9 +72,9 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
         if ($resolvedParams) {
-            $context->codePrinter->output('zephir_create_array('.$symbol.', zephir_get_intval('.$resolvedParams[0].'), 1 TSRMLS_CC);');
+            $context->codePrinter->output('zephir_create_array('.$symbol.', zephir_get_intval('.$resolvedParams[0].'), 1);');
         } else {
-            $context->codePrinter->output('zephir_create_array('.$symbol.', 0, 1 TSRMLS_CC);');
+            $context->codePrinter->output('zephir_create_array('.$symbol.', 0, 1);');
         }
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
diff --git a/Library/Optimizers/FunctionCall/CreateInstanceOptimizer.php b/Library/Optimizers/FunctionCall/CreateInstanceOptimizer.php
index a7bd29c5f6..9558c99554 100644
--- a/Library/Optimizers/FunctionCall/CreateInstanceOptimizer.php
+++ b/Library/Optimizers/FunctionCall/CreateInstanceOptimizer.php
@@ -74,7 +74,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $call->addCallStatusFlag($context);
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output('ZEPHIR_LAST_CALL_STATUS = zephir_create_instance('.$symbol.', '.$resolvedParams[0].' TSRMLS_CC);');
+        $context->codePrinter->output('ZEPHIR_LAST_CALL_STATUS = zephir_create_instance('.$symbol.', '.$resolvedParams[0].');');
 
         $call->checkTempParameters($context);
         $call->addCallStatusOrJump($context);
diff --git a/Library/Optimizers/FunctionCall/CreateInstanceParamsOptimizer.php b/Library/Optimizers/FunctionCall/CreateInstanceParamsOptimizer.php
index ecfa823091..3b74582816 100644
--- a/Library/Optimizers/FunctionCall/CreateInstanceParamsOptimizer.php
+++ b/Library/Optimizers/FunctionCall/CreateInstanceParamsOptimizer.php
@@ -69,7 +69,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $call->addCallStatusFlag($context);
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output('ZEPHIR_LAST_CALL_STATUS = zephir_create_instance_params('.$symbol.', '.$resolvedParams[0].', '.$resolvedParams[1].' TSRMLS_CC);');
+        $context->codePrinter->output('ZEPHIR_LAST_CALL_STATUS = zephir_create_instance_params('.$symbol.', '.$resolvedParams[0].', '.$resolvedParams[1].');');
 
         $call->addCallStatusOrJump($context);
 
diff --git a/Library/Optimizers/FunctionCall/EvalOptimizer.php b/Library/Optimizers/FunctionCall/EvalOptimizer.php
index dfdc839f21..d6faf4a5e8 100644
--- a/Library/Optimizers/FunctionCall/EvalOptimizer.php
+++ b/Library/Optimizers/FunctionCall/EvalOptimizer.php
@@ -69,7 +69,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
         $context->codePrinter->output(
-            sprintf('zephir_eval_php(%s, %s, "%s" TSRMLS_CC);', $resolvedParams[0], $symbol, $evalContext)
+            sprintf('zephir_eval_php(%s, %s, "%s");', $resolvedParams[0], $symbol, $evalContext)
         );
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
diff --git a/Library/Optimizers/FunctionCall/ExplodeOptimizer.php b/Library/Optimizers/FunctionCall/ExplodeOptimizer.php
index 9ffb481400..805ab50ddf 100644
--- a/Library/Optimizers/FunctionCall/ExplodeOptimizer.php
+++ b/Library/Optimizers/FunctionCall/ExplodeOptimizer.php
@@ -86,12 +86,12 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
         if (isset($str)) {
-            $context->codePrinter->output('zephir_fast_explode_str('.$symbol.', SL("'.$str.'"), '.$resolvedParams[0].', '.$limit.' TSRMLS_CC);');
+            $context->codePrinter->output('zephir_fast_explode_str('.$symbol.', SL("'.$str.'"), '.$resolvedParams[0].', '.$limit.');');
 
             return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
         }
 
-        $context->codePrinter->output('zephir_fast_explode('.$symbol.', '.$resolvedParams[0].', '.$resolvedParams[1].', '.$limit.' TSRMLS_CC);');
+        $context->codePrinter->output('zephir_fast_explode('.$symbol.', '.$resolvedParams[0].', '.$resolvedParams[1].', '.$limit.');');
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
diff --git a/Library/Optimizers/FunctionCall/FcloseOptimizer.php b/Library/Optimizers/FunctionCall/FcloseOptimizer.php
index 17c56a092d..a3ebdaab73 100644
--- a/Library/Optimizers/FunctionCall/FcloseOptimizer.php
+++ b/Library/Optimizers/FunctionCall/FcloseOptimizer.php
@@ -47,6 +47,6 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
 
-        return new CompiledExpression('bool', 'zephir_fclose('.$resolvedParams[0].' TSRMLS_CC)', $expression);
+        return new CompiledExpression('bool', 'zephir_fclose('.$resolvedParams[0].')', $expression);
     }
 }
diff --git a/Library/Optimizers/FunctionCall/FeofOptimizer.php b/Library/Optimizers/FunctionCall/FeofOptimizer.php
index 5f3458e1bc..19bf308e24 100644
--- a/Library/Optimizers/FunctionCall/FeofOptimizer.php
+++ b/Library/Optimizers/FunctionCall/FeofOptimizer.php
@@ -44,6 +44,6 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
 
-        return new CompiledExpression('bool', 'zephir_feof('.$resolvedParams[0].' TSRMLS_CC)', $expression);
+        return new CompiledExpression('bool', 'zephir_feof('.$resolvedParams[0].')', $expression);
     }
 }
diff --git a/Library/Optimizers/FunctionCall/FileExistsOptimizer.php b/Library/Optimizers/FunctionCall/FileExistsOptimizer.php
index d39628ca56..508ff5608a 100644
--- a/Library/Optimizers/FunctionCall/FileExistsOptimizer.php
+++ b/Library/Optimizers/FunctionCall/FileExistsOptimizer.php
@@ -47,6 +47,6 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
 
-        return new CompiledExpression('bool', '(zephir_file_exists('.$resolvedParams[0].' TSRMLS_CC) == SUCCESS)', $expression);
+        return new CompiledExpression('bool', '(zephir_file_exists('.$resolvedParams[0].') == SUCCESS)', $expression);
     }
 }
diff --git a/Library/Optimizers/FunctionCall/FileGetContentsOptimizer.php b/Library/Optimizers/FunctionCall/FileGetContentsOptimizer.php
index 38dd41bd13..b0491ce6eb 100644
--- a/Library/Optimizers/FunctionCall/FileGetContentsOptimizer.php
+++ b/Library/Optimizers/FunctionCall/FileGetContentsOptimizer.php
@@ -63,11 +63,11 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         }
         if ($symbolVariable) {
             $symbol = $context->backend->getVariableCode($symbolVariable);
-            $context->codePrinter->output('zephir_file_get_contents('.$symbol.', '.$resolvedParams[0].' TSRMLS_CC);');
+            $context->codePrinter->output('zephir_file_get_contents('.$symbol.', '.$resolvedParams[0].');');
 
             return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
         } else {
-            $context->codePrinter->output('zephir_file_get_contents(NULL, '.$resolvedParams[0].' TSRMLS_CC);');
+            $context->codePrinter->output('zephir_file_get_contents(NULL, '.$resolvedParams[0].');');
         }
 
         return new CompiledExpression('null', 'null', $expression);
diff --git a/Library/Optimizers/FunctionCall/FilePutContentsOptimizer.php b/Library/Optimizers/FunctionCall/FilePutContentsOptimizer.php
index bbedc11fd3..3299d0f83e 100644
--- a/Library/Optimizers/FunctionCall/FilePutContentsOptimizer.php
+++ b/Library/Optimizers/FunctionCall/FilePutContentsOptimizer.php
@@ -63,11 +63,11 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             if ($call->mustInitSymbolVariable()) {
                 $symbolVariable->initVariant($context);
             }
-            $context->codePrinter->output('zephir_file_put_contents('.$symbol.', '.$resolvedParams[0].', '.$resolvedParams[1].' TSRMLS_CC);');
+            $context->codePrinter->output('zephir_file_put_contents('.$symbol.', '.$resolvedParams[0].', '.$resolvedParams[1].');');
 
             return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
         } else {
-            $context->codePrinter->output('zephir_file_put_contents(NULL, '.$resolvedParams[0].', '.$resolvedParams[1].' TSRMLS_CC);');
+            $context->codePrinter->output('zephir_file_put_contents(NULL, '.$resolvedParams[0].', '.$resolvedParams[1].');');
         }
 
         return new CompiledExpression('null', 'null', $expression);
diff --git a/Library/Optimizers/FunctionCall/FilemtimeOptimizer.php b/Library/Optimizers/FunctionCall/FilemtimeOptimizer.php
index 28ceab105c..c6bf64547b 100644
--- a/Library/Optimizers/FunctionCall/FilemtimeOptimizer.php
+++ b/Library/Optimizers/FunctionCall/FilemtimeOptimizer.php
@@ -64,7 +64,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
 
-        $context->codePrinter->output('zephir_filemtime('.$symbol.', '.$resolvedParams[0].' TSRMLS_CC);');
+        $context->codePrinter->output('zephir_filemtime('.$symbol.', '.$resolvedParams[0].');');
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
diff --git a/Library/Optimizers/FunctionCall/FloorOptimizer.php b/Library/Optimizers/FunctionCall/FloorOptimizer.php
index 3ccba66fc1..34edf236b3 100644
--- a/Library/Optimizers/FunctionCall/FloorOptimizer.php
+++ b/Library/Optimizers/FunctionCall/FloorOptimizer.php
@@ -47,6 +47,6 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
 
-        return new CompiledExpression('double', 'zephir_floor('.$resolvedParams[0].' TSRMLS_CC)', $expression);
+        return new CompiledExpression('double', 'zephir_floor('.$resolvedParams[0].')', $expression);
     }
 }
diff --git a/Library/Optimizers/FunctionCall/FuncGetArgOptimizer.php b/Library/Optimizers/FunctionCall/FuncGetArgOptimizer.php
index 72178305d9..7fb5f4e5fa 100644
--- a/Library/Optimizers/FunctionCall/FuncGetArgOptimizer.php
+++ b/Library/Optimizers/FunctionCall/FuncGetArgOptimizer.php
@@ -79,7 +79,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             if ($context->backend->isZE3()) {
                 $template = 'zephir_get_arg(%s, zephir_get_intval(%s));';
             } else {
-                $template = 'zephir_get_arg(%s, zephir_get_intval(%s) TSRMLS_CC);';
+                $template = 'zephir_get_arg(%s, zephir_get_intval(%s));';
             }
 
             $context->codePrinter->output(sprintf($template, $symbol, $resolvedParams[0]));
diff --git a/Library/Optimizers/FunctionCall/FuncGetArgsOptimizer.php b/Library/Optimizers/FunctionCall/FuncGetArgsOptimizer.php
index 7ff40f3527..171dc5f734 100644
--- a/Library/Optimizers/FunctionCall/FuncGetArgsOptimizer.php
+++ b/Library/Optimizers/FunctionCall/FuncGetArgsOptimizer.php
@@ -53,7 +53,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         if ($context->backend->isZE3()) {
             $context->codePrinter->output('zephir_get_args('.$symbol.');');
         } else {
-            $context->codePrinter->output('zephir_get_args('.$symbol.' TSRMLS_CC);');
+            $context->codePrinter->output('zephir_get_args('.$symbol.');');
         }
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
diff --git a/Library/Optimizers/FunctionCall/FunctionExistsOptimizer.php b/Library/Optimizers/FunctionCall/FunctionExistsOptimizer.php
index 777d265fca..0253d41a09 100644
--- a/Library/Optimizers/FunctionCall/FunctionExistsOptimizer.php
+++ b/Library/Optimizers/FunctionCall/FunctionExistsOptimizer.php
@@ -49,9 +49,9 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             /* TODO: Solve this macro stuff better, move to backend */
             $macro = $context->backend->isZE3() ? 'SL' : 'SS';
 
-            return new CompiledExpression('bool', '(zephir_function_exists_ex('.$macro.'("'.strtolower($str).'") TSRMLS_CC) == SUCCESS)', $expression);
+            return new CompiledExpression('bool', '(zephir_function_exists_ex('.$macro.'("'.strtolower($str).'")) == SUCCESS)', $expression);
         }
 
-        return new CompiledExpression('bool', '(zephir_function_exists('.$resolvedParams[0].' TSRMLS_CC)  == SUCCESS)', $expression);
+        return new CompiledExpression('bool', '(zephir_function_exists('.$resolvedParams[0].')  == SUCCESS)', $expression);
     }
 }
diff --git a/Library/Optimizers/FunctionCall/FwriteOptimizer.php b/Library/Optimizers/FunctionCall/FwriteOptimizer.php
index 42091bf2d3..cb6baf985b 100644
--- a/Library/Optimizers/FunctionCall/FwriteOptimizer.php
+++ b/Library/Optimizers/FunctionCall/FwriteOptimizer.php
@@ -63,11 +63,11 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
                 $symbolVariable->initVariant($context);
             }
             $symbol = $context->backend->getVariableCode($symbolVariable);
-            $context->codePrinter->output('zephir_fwrite('.$symbol.', '.$resolvedParams[0].', '.$resolvedParams[1].' TSRMLS_CC);');
+            $context->codePrinter->output('zephir_fwrite('.$symbol.', '.$resolvedParams[0].', '.$resolvedParams[1].');');
 
             return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
         } else {
-            $context->codePrinter->output('zephir_fwrite(NULL, '.$resolvedParams[0].', '.$resolvedParams[1].' TSRMLS_CC);');
+            $context->codePrinter->output('zephir_fwrite(NULL, '.$resolvedParams[0].', '.$resolvedParams[1].');');
         }
 
         return new CompiledExpression('null', 'null', $expression);
diff --git a/Library/Optimizers/FunctionCall/GetCalledClassOptimizer.php b/Library/Optimizers/FunctionCall/GetCalledClassOptimizer.php
index 8409651e1f..5fc8e33b71 100644
--- a/Library/Optimizers/FunctionCall/GetCalledClassOptimizer.php
+++ b/Library/Optimizers/FunctionCall/GetCalledClassOptimizer.php
@@ -61,7 +61,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $symbolVariable->setDynamicTypes('string');
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output('zephir_get_called_class('.$symbol.' TSRMLS_CC);');
+        $context->codePrinter->output('zephir_get_called_class('.$symbol.');');
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
diff --git a/Library/Optimizers/FunctionCall/GetClassLowerOptimizer.php b/Library/Optimizers/FunctionCall/GetClassLowerOptimizer.php
index d6a06639fd..04495854bf 100644
--- a/Library/Optimizers/FunctionCall/GetClassLowerOptimizer.php
+++ b/Library/Optimizers/FunctionCall/GetClassLowerOptimizer.php
@@ -65,7 +65,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
 
-        $context->codePrinter->output('zephir_get_class('.$symbol.', '.$resolvedParams[0].', 1 TSRMLS_CC);');
+        $context->codePrinter->output('zephir_get_class('.$symbol.', '.$resolvedParams[0].', 1);');
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
diff --git a/Library/Optimizers/FunctionCall/GetClassNsOptimizer.php b/Library/Optimizers/FunctionCall/GetClassNsOptimizer.php
index b1ce851f6b..9224d85e42 100644
--- a/Library/Optimizers/FunctionCall/GetClassNsOptimizer.php
+++ b/Library/Optimizers/FunctionCall/GetClassNsOptimizer.php
@@ -65,9 +65,9 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
         if (!isset($resolvedParams[1])) {
-            $context->codePrinter->output('zephir_get_class_ns('.$symbol.', '.$resolvedParams[0].', 0 TSRMLS_CC);');
+            $context->codePrinter->output('zephir_get_class_ns('.$symbol.', '.$resolvedParams[0].', 0);');
         } else {
-            $context->codePrinter->output('zephir_get_class_ns('.$symbol.', '.$resolvedParams[0].', '.$resolvedParams[1].' TSRMLS_CC);');
+            $context->codePrinter->output('zephir_get_class_ns('.$symbol.', '.$resolvedParams[0].', '.$resolvedParams[1].');');
         }
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
diff --git a/Library/Optimizers/FunctionCall/GetClassOptimizer.php b/Library/Optimizers/FunctionCall/GetClassOptimizer.php
index 037fc38cad..cd6f97118f 100644
--- a/Library/Optimizers/FunctionCall/GetClassOptimizer.php
+++ b/Library/Optimizers/FunctionCall/GetClassOptimizer.php
@@ -64,7 +64,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
 
-        $context->codePrinter->output('zephir_get_class('.$symbol.', '.$resolvedParams[0].', 0 TSRMLS_CC);');
+        $context->codePrinter->output('zephir_get_class('.$symbol.', '.$resolvedParams[0].', 0);');
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
diff --git a/Library/Optimizers/FunctionCall/GetDefinedVarsOptimizer.php b/Library/Optimizers/FunctionCall/GetDefinedVarsOptimizer.php
index ff991a0ddb..85517e15f0 100644
--- a/Library/Optimizers/FunctionCall/GetDefinedVarsOptimizer.php
+++ b/Library/Optimizers/FunctionCall/GetDefinedVarsOptimizer.php
@@ -48,7 +48,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         if ($context->backend->isZE3()) {
             $context->codePrinter->output('zephir_get_defined_vars('.$symbol.');');
         } else {
-            $context->codePrinter->output('zephir_get_defined_vars('.$symbol.' TSRMLS_CC);');
+            $context->codePrinter->output('zephir_get_defined_vars('.$symbol.');');
         }
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
diff --git a/Library/Optimizers/FunctionCall/GetNsClassOptimizer.php b/Library/Optimizers/FunctionCall/GetNsClassOptimizer.php
index feff73f9c1..2f4d204c52 100644
--- a/Library/Optimizers/FunctionCall/GetNsClassOptimizer.php
+++ b/Library/Optimizers/FunctionCall/GetNsClassOptimizer.php
@@ -62,7 +62,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             $symbolVariable->initVariant($context);
         }
         $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output('zephir_get_ns_class('.$symbol.', '.$resolvedParams[0].', 0 TSRMLS_CC);');
+        $context->codePrinter->output('zephir_get_ns_class('.$symbol.', '.$resolvedParams[0].', 0);');
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
diff --git a/Library/Optimizers/FunctionCall/GettypeOptimizer.php b/Library/Optimizers/FunctionCall/GettypeOptimizer.php
index 87dd898d28..4a6bc07fb4 100644
--- a/Library/Optimizers/FunctionCall/GettypeOptimizer.php
+++ b/Library/Optimizers/FunctionCall/GettypeOptimizer.php
@@ -61,7 +61,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             $symbolVariable->initVariant($context);
         }
         $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output('zephir_gettype('.$symbol.', '.$resolvedParams[0].' TSRMLS_CC);');
+        $context->codePrinter->output('zephir_gettype('.$symbol.', '.$resolvedParams[0].');');
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
diff --git a/Library/Optimizers/FunctionCall/ImplodeOptimizer.php b/Library/Optimizers/FunctionCall/ImplodeOptimizer.php
index 8b8f2422d1..a8ef661d70 100644
--- a/Library/Optimizers/FunctionCall/ImplodeOptimizer.php
+++ b/Library/Optimizers/FunctionCall/ImplodeOptimizer.php
@@ -70,12 +70,12 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
         if (isset($str)) {
-            $context->codePrinter->output('zephir_fast_join_str('.$symbol.', SL("'.$str.'"), '.$resolvedParams[0].' TSRMLS_CC);');
+            $context->codePrinter->output('zephir_fast_join_str('.$symbol.', SL("'.$str.'"), '.$resolvedParams[0].');');
 
             return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
         }
 
-        $context->codePrinter->output('zephir_fast_join('.$symbol.', '.$resolvedParams[0].', '.$resolvedParams[1].' TSRMLS_CC);');
+        $context->codePrinter->output('zephir_fast_join('.$symbol.', '.$resolvedParams[0].', '.$resolvedParams[1].');');
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
diff --git a/Library/Optimizers/FunctionCall/InArrayOptimizer.php b/Library/Optimizers/FunctionCall/InArrayOptimizer.php
index 9f993b60f2..e51533c590 100644
--- a/Library/Optimizers/FunctionCall/InArrayOptimizer.php
+++ b/Library/Optimizers/FunctionCall/InArrayOptimizer.php
@@ -47,6 +47,6 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
 
-        return new CompiledExpression('bool', 'zephir_fast_in_array('.$resolvedParams[0].', '.$resolvedParams[1].' TSRMLS_CC)', $expression);
+        return new CompiledExpression('bool', 'zephir_fast_in_array('.$resolvedParams[0].', '.$resolvedParams[1].')', $expression);
     }
 }
diff --git a/Library/Optimizers/FunctionCall/InterfaceExistsOptimizer.php b/Library/Optimizers/FunctionCall/InterfaceExistsOptimizer.php
index 23db1bc8ed..ed34c3ec53 100644
--- a/Library/Optimizers/FunctionCall/InterfaceExistsOptimizer.php
+++ b/Library/Optimizers/FunctionCall/InterfaceExistsOptimizer.php
@@ -61,6 +61,6 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $context->headersManager->add('kernel/object');
 
-        return new CompiledExpression('bool', 'zephir_interface_exists('.$resolvedParams[0].', '.$autoload.' TSRMLS_CC)', $expression);
+        return new CompiledExpression('bool', 'zephir_interface_exists('.$resolvedParams[0].', '.$autoload.')', $expression);
     }
 }
diff --git a/Library/Optimizers/FunctionCall/IsCallableOptimizer.php b/Library/Optimizers/FunctionCall/IsCallableOptimizer.php
index a5abe9847f..a618d3a4a2 100644
--- a/Library/Optimizers/FunctionCall/IsCallableOptimizer.php
+++ b/Library/Optimizers/FunctionCall/IsCallableOptimizer.php
@@ -42,6 +42,6 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
 
-        return new CompiledExpression('bool', 'zephir_is_callable('.$resolvedParams[0].' TSRMLS_CC)', $expression);
+        return new CompiledExpression('bool', 'zephir_is_callable('.$resolvedParams[0].')', $expression);
     }
 }
diff --git a/Library/Optimizers/FunctionCall/JsonDecodeOptimizer.php b/Library/Optimizers/FunctionCall/JsonDecodeOptimizer.php
index 6b0ea617bb..2196e57dbf 100644
--- a/Library/Optimizers/FunctionCall/JsonDecodeOptimizer.php
+++ b/Library/Optimizers/FunctionCall/JsonDecodeOptimizer.php
@@ -76,7 +76,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         if ($context->backend->isZE3()) {
             $context->codePrinter->output('zephir_json_decode('.$symbol.', '.$resolvedParams[0].', '.$options.');');
         } else {
-            $context->codePrinter->output('zephir_json_decode('.$symbol.', &('.$symbol.'), '.$resolvedParams[0].', '.$options.' TSRMLS_CC);');
+            $context->codePrinter->output('zephir_json_decode('.$symbol.', &('.$symbol.'), '.$resolvedParams[0].', '.$options.');');
         }
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
diff --git a/Library/Optimizers/FunctionCall/JsonEncodeOptimizer.php b/Library/Optimizers/FunctionCall/JsonEncodeOptimizer.php
index ad378d80ca..ecd6827cf7 100644
--- a/Library/Optimizers/FunctionCall/JsonEncodeOptimizer.php
+++ b/Library/Optimizers/FunctionCall/JsonEncodeOptimizer.php
@@ -69,7 +69,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         if ($context->backend->isZE3()) {
             $context->codePrinter->output('zephir_json_encode('.$symbol.', '.$resolvedParams[0].', '.$options.');');
         } else {
-            $context->codePrinter->output('zephir_json_encode('.$symbol.', &('.$symbol.'), '.$resolvedParams[0].', '.$options.' TSRMLS_CC);');
+            $context->codePrinter->output('zephir_json_encode('.$symbol.', &('.$symbol.'), '.$resolvedParams[0].', '.$options.');');
         }
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
diff --git a/Library/Optimizers/FunctionCall/LdexpOptimizer.php b/Library/Optimizers/FunctionCall/LdexpOptimizer.php
index 625c83bd0e..775772b6b7 100644
--- a/Library/Optimizers/FunctionCall/LdexpOptimizer.php
+++ b/Library/Optimizers/FunctionCall/LdexpOptimizer.php
@@ -55,7 +55,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         return new CompiledExpression(
             'double',
-            'zephir_'.$this->getFunctionName().'('.$resolvedParams[0].', '.$resolvedParams[1].' TSRMLS_CC)',
+            'zephir_'.$this->getFunctionName().'('.$resolvedParams[0].', '.$resolvedParams[1].')',
             $expression
         );
     }
diff --git a/Library/Optimizers/FunctionCall/MethodExistsOptimizer.php b/Library/Optimizers/FunctionCall/MethodExistsOptimizer.php
index 38a67de73c..555a75f5c5 100644
--- a/Library/Optimizers/FunctionCall/MethodExistsOptimizer.php
+++ b/Library/Optimizers/FunctionCall/MethodExistsOptimizer.php
@@ -52,9 +52,9 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         /* TODO: Solve this macro stuff better, move to backend */
         $macro = $context->backend->isZE3() ? 'SL' : 'SS';
         if (isset($str)) {
-            return new CompiledExpression('bool', '(zephir_method_exists_ex('.$resolvedParams[0].', '.$macro.'("'.strtolower($str).'") TSRMLS_CC) == SUCCESS)', $expression);
+            return new CompiledExpression('bool', '(zephir_method_exists_ex('.$resolvedParams[0].', '.$macro.'("'.strtolower($str).'")) == SUCCESS)', $expression);
         }
 
-        return new CompiledExpression('bool', '(zephir_method_exists('.$resolvedParams[0].', '.$resolvedParams[1].' TSRMLS_CC)  == SUCCESS)', $expression);
+        return new CompiledExpression('bool', '(zephir_method_exists('.$resolvedParams[0].', '.$resolvedParams[1].')  == SUCCESS)', $expression);
     }
 }
diff --git a/Library/Optimizers/FunctionCall/MicrotimeOptimizer.php b/Library/Optimizers/FunctionCall/MicrotimeOptimizer.php
index 20947eeae0..46170c4c9e 100644
--- a/Library/Optimizers/FunctionCall/MicrotimeOptimizer.php
+++ b/Library/Optimizers/FunctionCall/MicrotimeOptimizer.php
@@ -58,14 +58,14 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             if ($call->mustInitSymbolVariable()) {
                 $symbolVariable->initVariant($context);
             }
-            $context->codePrinter->output('zephir_microtime('.$symbol.', NULL TSRMLS_CC);');
+            $context->codePrinter->output('zephir_microtime('.$symbol.', NULL);');
         } else {
             $symbolVariable->setDynamicTypes('double');
             $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
             if ($call->mustInitSymbolVariable()) {
                 $symbolVariable->initVariant($context);
             }
-            $context->codePrinter->output('zephir_microtime('.$symbol.', '.$resolvedParams[0].' TSRMLS_CC);');
+            $context->codePrinter->output('zephir_microtime('.$symbol.', '.$resolvedParams[0].');');
         }
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
diff --git a/Library/Optimizers/FunctionCall/MtRandOptimizer.php b/Library/Optimizers/FunctionCall/MtRandOptimizer.php
index eb7143c60e..a215002a3d 100644
--- a/Library/Optimizers/FunctionCall/MtRandOptimizer.php
+++ b/Library/Optimizers/FunctionCall/MtRandOptimizer.php
@@ -48,6 +48,6 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
 
-        return new CompiledExpression('long', 'zephir_mt_rand(zephir_get_intval('.$resolvedParams[0].'), zephir_get_intval('.$resolvedParams[1].') TSRMLS_CC)', $expression);
+        return new CompiledExpression('long', 'zephir_mt_rand(zephir_get_intval('.$resolvedParams[0].'), zephir_get_intval('.$resolvedParams[1].'))', $expression);
     }
 }
diff --git a/Library/Optimizers/FunctionCall/PregMatchOptimizer.php b/Library/Optimizers/FunctionCall/PregMatchOptimizer.php
index 2153f65929..892d7e03e7 100644
--- a/Library/Optimizers/FunctionCall/PregMatchOptimizer.php
+++ b/Library/Optimizers/FunctionCall/PregMatchOptimizer.php
@@ -92,7 +92,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
             $context->codePrinter->output(
                 sprintf(
-                    'zephir_preg_match(%s, %s, %s, %s, %d, %s, %s TSRMLS_CC);',
+                    'zephir_preg_match(%s, %s, %s, %s, %d, %s, %s);',
                     $symbol,
                     $resolvedParams[0],
                     $resolvedParams[1],
diff --git a/Library/Optimizers/FunctionCall/PrepareVirtualPathOptimizer.php b/Library/Optimizers/FunctionCall/PrepareVirtualPathOptimizer.php
index b0e316e170..e287345c33 100644
--- a/Library/Optimizers/FunctionCall/PrepareVirtualPathOptimizer.php
+++ b/Library/Optimizers/FunctionCall/PrepareVirtualPathOptimizer.php
@@ -63,7 +63,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         }
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output('zephir_prepare_virtual_path('.$symbol.', '.$resolvedParams[0].', '.$resolvedParams[1].' TSRMLS_CC);');
+        $context->codePrinter->output('zephir_prepare_virtual_path('.$symbol.', '.$resolvedParams[0].', '.$resolvedParams[1].');');
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
diff --git a/Library/Optimizers/FunctionCall/RoundOptimizer.php b/Library/Optimizers/FunctionCall/RoundOptimizer.php
index 8ea2fdb49b..9708eb69c8 100644
--- a/Library/Optimizers/FunctionCall/RoundOptimizer.php
+++ b/Library/Optimizers/FunctionCall/RoundOptimizer.php
@@ -70,7 +70,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
              */
             case 1:
                 $context->codePrinter->output(
-                    'zephir_round('.$symbol.', '.$resolvedParams[0].', NULL, NULL TSRMLS_CC);'
+                    'zephir_round('.$symbol.', '.$resolvedParams[0].', NULL, NULL);'
                 );
                 break;
 
@@ -79,13 +79,13 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
              */
             case 2:
                 $context->codePrinter->output(
-                    'zephir_round('.$symbol.', '.$resolvedParams[0].', '.$resolvedParams[1].', NULL TSRMLS_CC);'
+                    'zephir_round('.$symbol.', '.$resolvedParams[0].', '.$resolvedParams[1].', NULL);'
                 );
                 break;
 
             default:
                 $context->codePrinter->output(
-                    'zephir_round('.$symbol.', '.$resolvedParams[0].', '.$resolvedParams[1].', '.$resolvedParams[2].' TSRMLS_CC);'
+                    'zephir_round('.$symbol.', '.$resolvedParams[0].', '.$resolvedParams[1].', '.$resolvedParams[2].');'
                 );
                 break;
         }
diff --git a/Library/Optimizers/FunctionCall/StrReplaceOptimizer.php b/Library/Optimizers/FunctionCall/StrReplaceOptimizer.php
index c2fd5a8008..e20dacc9b7 100644
--- a/Library/Optimizers/FunctionCall/StrReplaceOptimizer.php
+++ b/Library/Optimizers/FunctionCall/StrReplaceOptimizer.php
@@ -72,7 +72,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $symbol = $context->backend->getVariableCodePointer($symbolVariable);
 
-        $context->codePrinter->output('zephir_fast_str_replace('.$symbol.', '.$resolvedParams[0].', '.$resolvedParams[1].', '.$resolvedParams[2].' TSRMLS_CC);');
+        $context->codePrinter->output('zephir_fast_str_replace('.$symbol.', '.$resolvedParams[0].', '.$resolvedParams[1].', '.$resolvedParams[2].');');
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
diff --git a/Library/Optimizers/FunctionCall/StripcslashesOptimizer.php b/Library/Optimizers/FunctionCall/StripcslashesOptimizer.php
index 24da6436f9..3749c38197 100644
--- a/Library/Optimizers/FunctionCall/StripcslashesOptimizer.php
+++ b/Library/Optimizers/FunctionCall/StripcslashesOptimizer.php
@@ -65,7 +65,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
         if ('ZendEngine2' == $context->backend->getName()) {
-            $context->codePrinter->output('zephir_stripcslashes('.$symbol.', '.$resolvedParams[0].' TSRMLS_CC);');
+            $context->codePrinter->output('zephir_stripcslashes('.$symbol.', '.$resolvedParams[0].');');
         } else {
             $context->codePrinter->output('zephir_stripcslashes('.$symbol.', '.$resolvedParams[0].');');
         }
diff --git a/Library/Optimizers/FunctionCall/StripslashesOptimizer.php b/Library/Optimizers/FunctionCall/StripslashesOptimizer.php
index 8eb37b4a44..6c405ba626 100644
--- a/Library/Optimizers/FunctionCall/StripslashesOptimizer.php
+++ b/Library/Optimizers/FunctionCall/StripslashesOptimizer.php
@@ -64,7 +64,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
         if ('ZendEngine2' == $context->backend->getName()) {
-            $context->codePrinter->output('zephir_stripslashes('.$symbol.', '.$resolvedParams[0].' TSRMLS_CC);');
+            $context->codePrinter->output('zephir_stripslashes('.$symbol.', '.$resolvedParams[0].');');
         } else {
             $context->codePrinter->output('zephir_stripslashes('.$symbol.', '.$resolvedParams[0].');');
         }
diff --git a/Library/Optimizers/FunctionCall/TrimOptimizer.php b/Library/Optimizers/FunctionCall/TrimOptimizer.php
index 5770525664..d760bc3bde 100644
--- a/Library/Optimizers/FunctionCall/TrimOptimizer.php
+++ b/Library/Optimizers/FunctionCall/TrimOptimizer.php
@@ -74,7 +74,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         }
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output('zephir_fast_trim('.$symbol.', '.$resolvedParams[0].', '.$charlist.', '.static::$TRIM_WHERE.' TSRMLS_CC);');
+        $context->codePrinter->output('zephir_fast_trim('.$symbol.', '.$resolvedParams[0].', '.$charlist.', '.static::$TRIM_WHERE.');');
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
diff --git a/Library/Optimizers/FunctionCall/UniqueKeyOptimizer.php b/Library/Optimizers/FunctionCall/UniqueKeyOptimizer.php
index 9ee293f7ce..6821e8a4a7 100644
--- a/Library/Optimizers/FunctionCall/UniqueKeyOptimizer.php
+++ b/Library/Optimizers/FunctionCall/UniqueKeyOptimizer.php
@@ -63,7 +63,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         }
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output('zephir_unique_key('.$symbol.', '.$resolvedParams[0].', '.$resolvedParams[1].' TSRMLS_CC);');
+        $context->codePrinter->output('zephir_unique_key('.$symbol.', '.$resolvedParams[0].', '.$resolvedParams[1].');');
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
diff --git a/Library/Optimizers/FunctionCall/UniquePathKeyOptimizer.php b/Library/Optimizers/FunctionCall/UniquePathKeyOptimizer.php
index 010fb7ef53..98aa30ed72 100644
--- a/Library/Optimizers/FunctionCall/UniquePathKeyOptimizer.php
+++ b/Library/Optimizers/FunctionCall/UniquePathKeyOptimizer.php
@@ -62,7 +62,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output('zephir_unique_path_key('.$symbol.', '.$resolvedParams[0].' TSRMLS_CC);');
+        $context->codePrinter->output('zephir_unique_path_key('.$symbol.', '.$resolvedParams[0].');');
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
diff --git a/Library/Optimizers/FunctionCall/VarDumpOptimizer.php b/Library/Optimizers/FunctionCall/VarDumpOptimizer.php
index 9bb4382b07..ac0048a7bd 100644
--- a/Library/Optimizers/FunctionCall/VarDumpOptimizer.php
+++ b/Library/Optimizers/FunctionCall/VarDumpOptimizer.php
@@ -87,7 +87,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             }
 
             $symbol = $context->backend->getVariableCodePointer($variable);
-            $context->codePrinter->output('zephir_var_dump('.$symbol.' TSRMLS_CC);');
+            $context->codePrinter->output('zephir_var_dump('.$symbol.');');
         }
 
         return new CompiledExpression('null', 'null', $expression);
diff --git a/Library/Optimizers/FunctionCall/VarExportOptimizer.php b/Library/Optimizers/FunctionCall/VarExportOptimizer.php
index be9635b446..150541f71b 100644
--- a/Library/Optimizers/FunctionCall/VarExportOptimizer.php
+++ b/Library/Optimizers/FunctionCall/VarExportOptimizer.php
@@ -111,12 +111,12 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
                 $symbolVariable->initVariant($context);
             }
             $symbol = $context->backend->getVariableCode($symbolVariable);
-            $context->codePrinter->output('zephir_var_export_ex('.$symbol.', '.$variableSymbol.' TSRMLS_CC);');
+            $context->codePrinter->output('zephir_var_export_ex('.$symbol.', '.$variableSymbol.');');
 
             return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
         }
 
-        $context->codePrinter->output('zephir_var_export('.$variableSymbol.' TSRMLS_CC);');
+        $context->codePrinter->output('zephir_var_export('.$variableSymbol.');');
 
         return new CompiledExpression('null', 'null', $expression);
     }