Merge "Code cleanup around compiler options and JIT."