Merge "Refactor code around JIT creation."