Switch to one guard per client

We should switch to one guard per client as per proposal 236.