[trunk] Another final round of fixes for sign conversion warnings.