Simplified process_endpoint(). #857