Fix my awful regex.

My double-quoted-string commit (09859a45) was awful.
Also added a test for parsing string params so this doesn't happen again.