Make event delegation keys more resilient to collisions.
Clean up addClass().