Server: Refactor to remove Server implementation specifics from trickling to the client.