Fix trailing argument parsing.