Further separation of the ClientNodeBase and MasterNodeBase from their
subclasses.