Make --client use the correct handles

It's a bit of a hack - but the real solution is to make this feature use --ideslave now.