Cleaned up event creation for #1393, although it shouldn't actually affect anything