Fixed deserialization of data, where we weren't keeping key/value pairs in sync.