More string escaping fixes.

Addresses #21