Somewhat smoother handling of handlers.