Fix more narrowing conversion errors.