Fix some gaps in the handling of event data properties. Thanks to @jitter in ff6ceadb...