Simplify click event handler selectors. Closes #2122.
Simplify click event handler selectors.