Move more client-ey stuff from ServerClientDemo into Client.