Some cleanup of client/main.c.