Tolerate commas in values. Fixes #266