Ensure resaving an Event doesn't reset it's Target. Fixes #2047