One more stage in conversation and messaging refactoring.