Only assign intentionally passed event data values

Just a simple change, but should prevent someone's heartache in the future.