Small refactor in messaging.