Fix remaining non-controversial warnings.