[XSP] Clean up XSPWorker, use modern features