Minor updates to cleanup the EventTo* TriggerActions