Quick hack for supporting commas as argument delimiters. A better implementation may require a lexer rewrite