A bit more clean up of the ClientNode classes.