Rework handling of commas