Switch to SafeStringify