Make our deserializing consistent with serializing.

Also fixes problems with double-quoted strings (historical artifact).

STUD-640