Fix new strong-mode warnings.