Fix handling of "args"