If we stop special-casing commas, this part should be changed (probably to just ``\\s*``).  I would suggest to do this first and see if that breaks anything before further tweaking other parts of the regex.