WebServer: Implement review comments from Saibaba.