Added support for commas as argument delimiters. May need a lexer rewrite to improve error handling around this