Changed how arguments are parsed.