Refactoring API into more sensible split of event handlers.