Merge "Jit: Minor cleanup - enum size fix, remove useless code, control consistency."