Fix more possible deopts