Initial work on refactoring MessageWrapper.