- Made several refactorings in JIT for clarity/safety