[XSP] Clean up XSPWebSource, use modern features