- Progress on JIT refactoring