Fix more possible deopts
Merge pull request #125 from mmun/fix-deopts

Fix more possible deopts