More places to eliminate the cast to argv but were not giving warnings.