Updates to match RDServices protocol changes, move some private items to...

... .m files.