Better handling of event defaults