Optimize expected_events/_form