Fix new strong-mode errors.