None of this should change the engine's behavior, but the code is better this way. Former-commit-id: 0127769848fc1f7fc8006ee607985cfc0ead2965
None of this should change the engine's behavior, but the code is better this way. Former-commit-id: 0127769848fc1f7fc8006ee607985cfc0ead2965