#6132: Refactor XSS code