Still more work on unserializing.