Don't do our own escaping.
Trim old values?