More rework.

Now redoing server.c the way client.c was redone, preparatory to an
intermediate sharingless version.