Take care of more int casts.