Merge "Code cleanup between debugger and jit."