Refactor events so components become clients.