* Workaround for #4068, we lose some performance, but at least we don't dead-lock.
* Added a TODO: XSS plugin performance improvement #4697