s3-waf: Seperate rpc_server and rpc_service.