Begin conversion to separate handlers.