Merge "Generalize codegen and simplification of deopt."