Adjust logic for libraries to work with latest WxT library.