Get rid of some of the overlap between the client and node js libraries.