Connection: consolidate inbuilt event types