Fix for changed highlighted logic in WxT (upstream).