Refactor client Message generation to proxy methods on client class.