Fix argument handling.