More cosmetic improvements.
Removed commented-out code and commented the DEFINE-EVENT-CLASS macro.