Moved two stream-related pickler/unpickler's to Marshal