Merge "Jit: Rework delayed start plus misc. cleanup"