Don't throw exceptions when value pairs have spaces in them

"(1,2)" worked, "(1, 2)" crapped out. Fix it.

Change-Id: I71262909280f88d930898a2bcf37d379add9fdea