Fix more regressions in typing