client side refactoring

I'd like to commit this tag - refactoringreadyforhead1
to HEAD.

It'll help adrian get the next bit of the commloops out of the way, and
it fixes a number of bugs that became apparent during the refactoring.

If I don't hear anything, this will go in mid next week. I'd really love
it if I did hear something - two votes for do-it-now or something like
that :}.

Rob