Minor cleanup of `React/EventListener` usage

@stevoland could do with a quick review but should be good to go.