Removed null-checks for KeyValuePair
Fixed serialization of raw-json strings.