[XSP] Clean up XSPRequestBroker, use modern features