Simplify click event handler selectors. Closes #2122.