- Minor JIT refactorings for cleaner code