Fix more inconsistent types.