Add support for an array of event types/extensions, fixes #17023
Don't do an extraneous mixin on the data returned from a single arg call to data(), fixes #15503