Improve handling of extended option types when copying events. Edge cases still exist.