Slightly improved command-matching regex (commas in command params now ignored)