Restructured events a bit.