Merge "Refactor code so that JIT can parse compiler options."