diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
index 71658932..acf360f8 100644
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -16,7 +16,7 @@ return (new PhpCsFixer\Config())
         '@Symfony'                                         => true,
         'align_multiline_comment'                          => ['comment_type' => 'all_multiline'],
         'array_syntax'                                     => ['syntax' => 'short'],
-        'binary_operator_spaces'                           => ['operators' => ['=' => 'align', '=>' => 'align', ]],
+        'binary_operator_spaces'                           => ['operators' => ['=' => null, '=>' => null, ]],
         'blank_line_after_namespace'                       => true,
         'blank_line_before_statement'                      => ['statements' => ['declare']],
         'class_attributes_separation'                      => true,
diff --git a/src/template/extension.cc.php b/src/template/extension.cc.php
index 9aade787..da872bf9 100644
--- a/src/template/extension.cc.php
+++ b/src/template/extension.cc.php
@@ -25,7 +25,7 @@ zend_class_entry * <?= $ce ?>;
 zend_class_entry *<?= Translator::PREFIX . Translator::CLASS_ENTRY_MAP . '[' . count($this->classMap) . ']' ?>;
 
 zend_class_entry *php_get_class_entry(int class_id, const char *class_name) {
-    if (<?= Translator::PREFIX . Translator::CLASS_ENTRY_MAP ?>[class_id] == nullptr) {
+    if (UNEXPECTED(<?= Translator::PREFIX . Translator::CLASS_ENTRY_MAP ?>[class_id] == nullptr)) {
         <?= Translator::PREFIX . Translator::CLASS_ENTRY_MAP ?>[class_id] = php::getClassEntrySafe(class_name);
     }
     return <?= Translator::PREFIX . Translator::CLASS_ENTRY_MAP ?>[class_id];
@@ -107,13 +107,6 @@ foreach ($this->classes as $classDef):
     endforeach;
 endforeach;
 ?>
-
-// class entry
-<?php
-foreach ($this->classMap as $class => $id):
-    ?>
-    <?= Translator::PREFIX . Translator::CLASS_ENTRY_MAP . '[' . $id . ']' ?> = php::getClassEntry("<?= $this->escapeString($class) ?>");
-<?php endforeach; ?>
 }
 
 void php_app_clean() {