Minor changes in preparation for HTTP server implementation.