Fix client->server calls to work with Dariusz's optimisations to yield.