Adapt to new way of doing thirdparty handlers.